@@ -1461,8 +1461,8 @@ void GeoscapeState::time1Hour()
 		{
 			if (j->second > PROGRESS_NOT_COMPLETE)
 			{
-				(*i)->removeProduction (j->first);
 				popup(new ProductionCompleteState((*i),  tr(j->first->getRules()->getName()), this, j->second));
+				(*i)->removeProduction(j->first);
 			}
 		}
 
@@ -1565,19 +1565,22 @@ void GeoscapeState::time1Day()
 			_game->getSavedGame()->getAvailableResearchProjects(before, _game->getMod(), *i);
 		}
 		// 3. add finished research, including lookups and getonefrees (up to 4x)
-		for (std::vector<ResearchProject*>::const_iterator iter = finished.begin(); iter != finished.end(); ++iter)
+		for (std::vector<ResearchProject*>::iterator iter = finished.begin(); iter != finished.end(); ++iter)
 		{
+			const RuleResearch *bonus = 0;
+			const RuleResearch *research = (*iter)->getRules();
+
 			// 3a. remove finished research from the base where it was researched
 			(*i)->removeResearch(*iter);
-			// 3b. handle interrogations
-			RuleResearch * bonus = 0;
-			const RuleResearch * research = (*iter)->getRules();
+			(*iter) = 0;
+
+			// 3b. handle interrogation
 			if (Options::retainCorpses && research->destroyItem() && _game->getMod()->getUnit(research->getName()))
 			{
 				(*i)->getStorageItems()->addItem(_game->getMod()->getArmor(_game->getMod()->getUnit(research->getName())->getArmor(), true)->getCorpseGeoscape());
 			}
 			// 3c. handle getonefrees (topic+lookup)
-			if (!(*iter)->getRules()->getGetOneFree().empty())
+			if (!research->getGetOneFree().empty())
 			{
 				std::vector<std::string> possibilities;
 				for (std::vector<std::string>::const_iterator f = research->getGetOneFree().begin(); f != research->getGetOneFree().end(); ++f)
@@ -1681,8 +1684,6 @@ void GeoscapeState::time1Day()
 					}
 				}
 			}
-			// 3k. remove processed item from the list (and continue with the next item)
-			delete(*iter);
 		}
 
 		// Handle soldier wounds
 
@@ -1095,20 +1095,22 @@ void Base::removeResearch(ResearchProject * project)
 	{
 		_research.erase(iter);
 	}
+	delete project;
 }
 
 /**
  * Remove a Production from the Base
  * @param p A pointer to a Production
  */
-void Base::removeProduction (Production * p)
+void Base::removeProduction(Production * p)
 {
 	_engineers += p->getAssignedEngineers();
 	std::vector<Production *>::iterator iter = std::find (_productions.begin(), _productions.end(), p);
 	if (iter != _productions.end())
 	{
 		_productions.erase(iter);
 	}
+	delete p;
 }
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -1461,8 +1461,8 @@ void GeoscapeState::time1Hour()`
`1461`	`1461`	`{`
`1462`	`1462`	`if (j->second > PROGRESS_NOT_COMPLETE)`
`1463`	`1463`	`{`
`1464`		`- (*i)->removeProduction (j->first);`
`1465`	`1464`	`popup(new ProductionCompleteState((*i), tr(j->first->getRules()->getName()), this, j->second));`
	`1465`	`+ (*i)->removeProduction(j->first);`
`1466`	`1466`	`}`
`1467`	`1467`	`}`
`1468`	`1468`
`@@ -1565,19 +1565,22 @@ void GeoscapeState::time1Day()`
`1565`	`1565`	`_game->getSavedGame()->getAvailableResearchProjects(before, _game->getMod(), *i);`
`1566`	`1566`	`}`
`1567`	`1567`	`// 3. add finished research, including lookups and getonefrees (up to 4x)`
`1568`		`- for (std::vector<ResearchProject*>::const_iterator iter = finished.begin(); iter != finished.end(); ++iter)`
	`1568`	`+ for (std::vector<ResearchProject*>::iterator iter = finished.begin(); iter != finished.end(); ++iter)`
`1569`	`1569`	`{`
	`1570`	`+ const RuleResearch *bonus = 0;`
	`1571`	`+ const RuleResearch research = (iter)->getRules();`
	`1572`	`+`
`1570`	`1573`	`// 3a. remove finished research from the base where it was researched`
`1571`	`1574`	`(i)->removeResearch(iter);`
`1572`		`- // 3b. handle interrogations`
`1573`		`- RuleResearch * bonus = 0;`
`1574`		`- const RuleResearch * research = (*iter)->getRules();`
	`1575`	`+ (*iter) = 0;`
	`1576`	`+`
	`1577`	`+ // 3b. handle interrogation`
`1575`	`1578`	`if (Options::retainCorpses && research->destroyItem() && _game->getMod()->getUnit(research->getName()))`
`1576`	`1579`	`{`
`1577`	`1580`	`(*i)->getStorageItems()->addItem(_game->getMod()->getArmor(_game->getMod()->getUnit(research->getName())->getArmor(), true)->getCorpseGeoscape());`
`1578`	`1581`	`}`
`1579`	`1582`	`// 3c. handle getonefrees (topic+lookup)`
`1580`		`- if (!(*iter)->getRules()->getGetOneFree().empty())`
	`1583`	`+ if (!research->getGetOneFree().empty())`
`1581`	`1584`	`{`
`1582`	`1585`	`std::vector<std::string> possibilities;`
`1583`	`1586`	`for (std::vector<std::string>::const_iterator f = research->getGetOneFree().begin(); f != research->getGetOneFree().end(); ++f)`
`@@ -1681,8 +1684,6 @@ void GeoscapeState::time1Day()`
`1681`	`1684`	`}`
`1682`	`1685`	`}`
`1683`	`1686`	`}`
`1684`		`- // 3k. remove processed item from the list (and continue with the next item)`
`1685`		`- delete(*iter);`
`1686`	`1687`	`}`
`1687`	`1688`
`1688`	`1689`	`// Handle soldier wounds`
Original file line number	Diff line number	Diff line change
`@@ -1095,20 +1095,22 @@ void Base::removeResearch(ResearchProject * project)`
`1095`	`1095`	`{`
`1096`	`1096`	`_research.erase(iter);`
`1097`	`1097`	`}`
	`1098`	`+ delete project;`
`1098`	`1099`	`}`
`1099`	`1100`
`1100`	`1101`	`/**`
`1101`	`1102`	`* Remove a Production from the Base`
`1102`	`1103`	`* @param p A pointer to a Production`
`1103`	`1104`	`*/`
`1104`		`-void Base::removeProduction (Production * p)`
	`1105`	`+void Base::removeProduction(Production * p)`
`1105`	`1106`	`{`
`1106`	`1107`	`_engineers += p->getAssignedEngineers();`
`1107`	`1108`	`std::vector<Production *>::iterator iter = std::find (_productions.begin(), _productions.end(), p);`
`1108`	`1109`	`if (iter != _productions.end())`
`1109`	`1110`	`{`
`1110`	`1111`	`_productions.erase(iter);`
`1111`	`1112`	`}`
	`1113`	`+ delete p;`
`1112`	`1114`	`}`
`1113`	`1115`
`1114`	`1116`	`/**`