diff --git a/admin/Default/1.6/universe_create_locations.php b/admin/Default/1.6/universe_create_locations.php
index 12dab84f0..69b5e9b9f 100644
--- a/admin/Default/1.6/universe_create_locations.php
+++ b/admin/Default/1.6/universe_create_locations.php
@@ -1,11 +1,11 @@
 <?php
 require_once(get_file_loc('SmrGalaxy.class.inc'));
 
-$locations =& SmrLocation::getAllLocations();
+$locations = SmrLocation::getAllLocations();
 
 // Initialize all location counts to zero
 $totalLocs = array();
-foreach ($locations as &$location) {
+foreach ($locations as $location) {
 	$totalLocs[$location->getTypeID()] = 0;
 }
 
@@ -46,28 +46,25 @@ public function added($locID) {
 // Set any extra information to be displayed with each location
 $locText = array();
 $categories = new Categories();
-foreach ($locations as &$location) {
+foreach ($locations as $location) {
 	$extra = '<span class="small"><br />';
 	if ($location->isWeaponSold()) {
 		$extra .= $categories->addLoc($location->getTypeID(), 'Weapons');
-		$weaponsSold =& $location->getWeaponsSold();
-		foreach($weaponsSold as &$weapon) {
+		foreach ($location->getWeaponsSold() as $weapon) {
 			$extra .= $weapon->getName() . '&nbsp;&nbsp;&nbsp;(' . $weapon->getShieldDamage() . '/' . $weapon->getArmourDamage() . '/' . $weapon->getBaseAccuracy() . ')<br />';
-		} unset($weapon);
+		}
 	}
 	if ($location->isShipSold()) {
 		$extra .= $categories->addLoc($location->getTypeID(), 'Ships');
-		$shipsSold =& $location->getShipsSold();
-		foreach ($shipsSold as &$shipSold) {
+		foreach ($location->getShipsSold() as $shipSold) {
 			$extra .= $shipSold['Name'] . '<br />';
-		} unset($shipSold);
+		}
 	}
 	if ($location->isHardwareSold()) {
 		$extra .= $categories->addLoc($location->getTypeID(), 'Hardware');
-		$hardwareSold =& $location->getHardwareSold();
-		foreach ($hardwareSold as &$hardware) {
+		foreach ($location->getHardwareSold() as $hardware) {
 			$extra .= $hardware['Name'] . '<br />';
-		} unset($hardware);
+		}
 	}
 	if ($location->isBar()) {
 		$extra .= $categories->addLoc($location->getTypeID(), 'Bars');
@@ -85,7 +82,7 @@ public function added($locID) {
 	$extra .= '</span>';
 
 	$locText[$location->getTypeID()] = $location->getName() . $extra;
-} unset($location);
+}
 $template->assign('LocText', $locText);
 $template->assign('LocTypes', $categories->locTypes);
 
diff --git a/admin/Default/1.6/universe_create_save_processing.php b/admin/Default/1.6/universe_create_save_processing.php
index d0451659b..819acb282 100644
--- a/admin/Default/1.6/universe_create_save_processing.php
+++ b/admin/Default/1.6/universe_create_save_processing.php
@@ -73,10 +73,10 @@
 		$galaxy->setMaxForceTime($_POST['forces' . $i] * 3600);
 	}
 	SmrGalaxy::saveGalaxies();
-	$galaxies =& SmrGalaxy::getGameGalaxies($var['game_id'],true);
-	foreach($galaxies as &$galaxy) {
+	$galaxies = SmrGalaxy::getGameGalaxies($var['game_id'],true);
+	foreach ($galaxies as $galaxy) {
 		$galaxy->generateSectors();
-	} unset($galaxy);
+	}
 	SmrSector::saveSectors();
 	$var['message'] = '<span class="green">Success</span> : Succesfully created galaxies.';
 }
diff --git a/admin/Default/1.6/universe_create_sector_details.php b/admin/Default/1.6/universe_create_sector_details.php
index c0ffbe8d0..749aa6f33 100644
--- a/admin/Default/1.6/universe_create_sector_details.php
+++ b/admin/Default/1.6/universe_create_sector_details.php
@@ -44,27 +44,25 @@
 }
 $PHP_OUTPUT.= '</select>';
 $PHP_OUTPUT.= '<select name="port_race">';
-$races =& Globals::getRaces();
-foreach ($races as &$race) {
+foreach (Globals::getRaces() as $race) {
 	$PHP_OUTPUT.= '<option value="' . $race['Race ID'] . '"';
 	if ($sector->hasPort() && $sector->getPort()->getRaceID() == $race['Race ID']) $PHP_OUTPUT.= 'selected';
 	$PHP_OUTPUT.= '>' . $race['Race Name'] . '</option>';
-} unset($race);
+}
 $PHP_OUTPUT.= '</select>';
 //goods determined randomly to sway admin abuse
 $PHP_OUTPUT.= '<br /><br />';
-$locations =& SmrLocation::getAllLocations();
 $sectorLocations =& $sector->getLocations();
 for ($i=0;$i<UNI_GEN_LOCATION_SLOTS;$i++) {
 	$PHP_OUTPUT.= 'Location ' . ($i + 1) . ': <select name="loc_type' . $i . '">';
 	$PHP_OUTPUT.= '<option value="0">No Location</option>';
-	foreach ($locations as &$location) {
+	foreach (SmrLocation::getAllLocations() as $location) {
 		$PHP_OUTPUT.= '<option value="' . $location->getTypeID() . '"';
 		if (isset($sectorLocations[$i]) && $sectorLocations[$i]->equals($location)) {
 			$PHP_OUTPUT.= 'selected';
 		}
 		$PHP_OUTPUT.= '>' . $location->getName() . '</option>';
-	} unset($location);
+	}
 	$PHP_OUTPUT.= '</select><br />';
 }
 
diff --git a/engine/Default/bar_galmap_buy.php b/engine/Default/bar_galmap_buy.php
index 2b531414c..547c52a92 100644
--- a/engine/Default/bar_galmap_buy.php
+++ b/engine/Default/bar_galmap_buy.php
@@ -58,10 +58,10 @@
 	$PHP_OUTPUT.=create_echo_form($container);
 	$PHP_OUTPUT.=('<select type="select" name="gal_id">');
 	$PHP_OUTPUT.=('<option value="0">[Select a galaxy]</option>');
-	$gameGalaxies =& SmrGalaxy::getGameGalaxies($player->getGameID());
-	foreach ($gameGalaxies as &$galaxy) {
+	$gameGalaxies = SmrGalaxy::getGameGalaxies($player->getGameID());
+	foreach ($gameGalaxies as $galaxy) {
 		$PHP_OUTPUT.=('<option value="'.$galaxy->getGalaxyID().'">' . $galaxy->getName() . '</option>');
-	} unset($galaxy);
+	}
 	$PHP_OUTPUT.=('</select><br />');
 	$PHP_OUTPUT.=create_submit('Buy the map');
 	$PHP_OUTPUT.=('</form></div>');
diff --git a/engine/Default/course_plot_processing.php b/engine/Default/course_plot_processing.php
index 1a6bf4c52..99ec3043a 100644
--- a/engine/Default/course_plot_processing.php
+++ b/engine/Default/course_plot_processing.php
@@ -21,13 +21,13 @@
 
 $startExists = false;
 $targetExists = false;
-$galaxies =& SmrGalaxy::getGameGalaxies($player->getGameID());
-foreach($galaxies as &$galaxy) {
+$galaxies = SmrGalaxy::getGameGalaxies($player->getGameID());
+foreach ($galaxies as $galaxy) {
 	if($galaxy->contains($start))
 		$startExists = true;
 	if($galaxy->contains($target))
 		$targetExists = true;
-} unset($galaxy);
+}
 
 if($startExists===false || $targetExists===false)
 	create_error('The sectors have to exist!');
diff --git a/engine/Default/forces_attack_processing.php b/engine/Default/forces_attack_processing.php
index c7611cbf4..c1b46e750 100644
--- a/engine/Default/forces_attack_processing.php
+++ b/engine/Default/forces_attack_processing.php
@@ -63,12 +63,12 @@
 $attackers = $player->getSector()->getFightingTradersAgainstForces($player, $bump);
 
 //decloak all attackers
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	$attacker->getShip()->decloak();
 	if (!$bump) {
 		$attacker->setLastSectorID(0);
 	}
-} unset($attacker);
+}
 
 // If mines are bumped, the forces shoot first. Otherwise player shoots first.
 if ($bump) {
@@ -76,11 +76,11 @@
 }
 
 $results['Attackers'] = array('TotalDamage' => 0);
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	$playerResults =& $attacker->shootForces($forces);
 	$results['Attackers']['Traders'][$attacker->getAccountID()]  =& $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
-} unset($attacker);
+}
 
 if (!$bump) {
 	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
diff --git a/engine/Default/planet_attack_processing.php b/engine/Default/planet_attack_processing.php
index 3772f6606..1e14d0934 100644
--- a/engine/Default/planet_attack_processing.php
+++ b/engine/Default/planet_attack_processing.php
@@ -39,20 +39,20 @@
 				'Forces' => array(),
 				'Forced' => false);
 
-$attackers =& $sector->getFightingTradersAgainstPlanet($player, $planet);
+$attackers = $sector->getFightingTradersAgainstPlanet($player, $planet);
 
 $planet->attackedBy($player,$attackers);
 
 //decloak all attackers
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	$attacker->getShip()->decloak();
-} unset($attacker);
+}
 
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	$playerResults =& $attacker->shootPlanet($planet, false);
 	$results['Attackers']['Traders'][$attacker->getAccountID()]  =& $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
-} unset($attacker);
+}
 $results['Attackers']['Downgrades'] = $planet->checkForDowngrade($results['Attackers']['TotalDamage']);
 $results['Planet'] =& $planet->shootPlayers($attackers);
 
@@ -87,10 +87,10 @@
 }
 
 // Update sector messages for attackers
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	if(!$player->equals($attacker))
 		$db->query('REPLACE INTO sector_message VALUES(' . $attacker->getAccountID() . ',' . $attacker->getGameID() . ',' . $db->escapeString('[ATTACK_RESULTS]'.$logId) . ')');
-} unset($attacker);
+}
 
 $container = create_container('skeleton.php', 'planet_attack.php');
 $container['sector_id'] = $planet->getSectorID();
diff --git a/engine/Default/port_attack_processing.php b/engine/Default/port_attack_processing.php
index 01914c929..44b927e97 100644
--- a/engine/Default/port_attack_processing.php
+++ b/engine/Default/port_attack_processing.php
@@ -34,21 +34,21 @@
 				'Forces' => array(),
 				'Forced' => false);
 
-$attackers =& $sector->getFightingTradersAgainstPort($player, $port);
+$attackers = $sector->getFightingTradersAgainstPort($player, $port);
 
 $port->attackedBy($player,$attackers);
 
 // take the turns and decloak all attackers
-foreach($attackers as &$attacker) {
+foreach($attackers as $attacker) {
 	$attacker->takeTurns(TURNS_TO_SHOOT_PORT,0);
 	$attacker->getShip()->decloak();
-} unset($attacker);
+}
 
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	$playerResults =& $attacker->shootPort($port);
 	$results['Attackers']['Traders'][$attacker->getAccountID()]  =& $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
-} unset($attacker);
+}
 $results['Attackers']['Downgrades'] = $port->checkForDowngrade($results['Attackers']['TotalDamage']);
 $results['Port'] =& $port->shootPlayers($attackers);
 
@@ -61,11 +61,11 @@
 $db->query('INSERT INTO combat_logs VALUES(\'\',' . $db->escapeNumber($player->getGameID()) . ',\'PORT\',' . $db->escapeNumber($port->getSectorID()) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($player->getAccountID()) . ',' . $db->escapeNumber($player->getAllianceID()) . ','.$db->escapeNumber(ACCOUNT_ID_PORT).',' . $db->escapeNumber(PORT_ALLIANCE_ID) . ',' . $db->escapeBinary(gzcompress($serializedResults)) . ')');
 unserialize($serializedResults); //because of references we have to undo this.
 $logId = $db->escapeString('[ATTACK_RESULTS]'.$db->getInsertID());
-foreach($attackers as &$attacker) {
+foreach ($attackers as $attacker) {
 	if(!$player->equals($attacker)) {
 		$db->query('REPLACE INTO sector_message VALUES(' . $db->escapeNumber($attacker->getAccountID()) . ',' . $db->escapeNumber($attacker->getGameID()) . ','.$logId.')');
 	}
-} unset($attacker);
+}
 
 $container = create_container('skeleton.php','port_attack.php');
 
diff --git a/engine/Default/sector_jump_processing.php b/engine/Default/sector_jump_processing.php
index 58a25ea18..0ce0800ad 100644
--- a/engine/Default/sector_jump_processing.php
+++ b/engine/Default/sector_jump_processing.php
@@ -41,12 +41,11 @@
 }
 
 if ($sector->hasForces()) {
-	$sectorForces =& $sector->getForces();
-	foreach($sectorForces as &$forces) {
+	foreach ($sector->getForces() as $forces) {
 		if($forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
 			create_error('You cannot jump when there are hostile mines in the sector!');
 		}
-	} unset($forces);
+	}
 }
 
 // create sector object for target sector
@@ -103,14 +102,13 @@
 // send scout msg
 $sector->enteringSector($player,MOVEMENT_JUMP);
 
-$sectorForces =& $sector->getForces();
 $mineOwnerID = false;
-foreach($sectorForces as &$forces) {
+foreach ($sector->getForces() as $forces) {
 	if(!$mineOwnerID && $forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
 		$mineOwnerID = $forces->getOwnerID();
 		break;
 	}
-} unset($forces);
+}
 if($mineOwnerID) {
 	if ($player->hasNewbieTurns()) {
 		$container = create_container('skeleton.php', 'current_sector.php');
diff --git a/engine/Default/sector_scan.php b/engine/Default/sector_scan.php
index 4fa40b8b8..6dd7d09e9 100644
--- a/engine/Default/sector_scan.php
+++ b/engine/Default/sector_scan.php
@@ -15,17 +15,15 @@
 $enemy_vessel = 0;
 
 // iterate over all forces in the target sector
-$scanSectorAllForces =& $scanSector->getForces();
-foreach ($scanSectorAllForces as &$scanSectorForces) {
+foreach ($scanSector->getForces() as $scanSectorForces) {
 	// decide if it's a friendly or enemy stack
 	if ($player->sameAlliance($scanSectorForces->getOwner()))
 		$friendly_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
 	else
 		$enemy_forces += $scanSectorForces->getMines() * 3 + $scanSectorForces->getCDs() * 2 + $scanSectorForces->getSDs();
-} unset($scanSectorForces);
+}
 
-$scanSectorPlayers =& $scanSector->getOtherTraders($player);
-foreach($scanSectorPlayers as &$scanSectorPlayer) {
+foreach ($scanSector->getOtherTraders($player) as $scanSectorPlayer) {
 	$scanSectorShip =& $scanSectorPlayer->getShip();
 
 	// he's a friend if he's in our alliance (and we are not in a 0 alliance
@@ -33,7 +31,7 @@
 		$friendly_vessel += $scanSectorShip->getAttackRating();
 	else
 		$enemy_vessel += $scanSectorShip->getDefenseRating() * 10;
-} unset($scanSectorPlayer);
+}
 
 $PHP_OUTPUT.=('<p>');
 $PHP_OUTPUT.=('<table class="standard">');
diff --git a/engine/Default/trader_attack_processing.php b/engine/Default/trader_attack_processing.php
index 87020468d..e201a603c 100644
--- a/engine/Default/trader_attack_processing.php
+++ b/engine/Default/trader_attack_processing.php
@@ -26,14 +26,14 @@
 	else if($targetPlayer->hasFederalProtection())
 		create_error('Target is under federal protection.');
 
-$fightingPlayers =& $sector->getFightingTraders($player,$targetPlayer);
+$fightingPlayers = $sector->getFightingTraders($player,$targetPlayer);
 
 //decloak all fighters
-foreach($fightingPlayers as &$teamPlayers) {
-	foreach($teamPlayers as &$teamPlayer) {
+foreach ($fightingPlayers as $teamPlayers) {
+	foreach ($teamPlayers as $teamPlayer) {
 		$teamPlayer->getShip()->decloak();
-	} unset($teamPlayer);
-} unset($teamPlayers);
+	}
+}
 
 // Take off the 3 turns for attacking
 $player->takeTurns(3);
@@ -41,16 +41,16 @@
 
 $results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0),
 				'Defenders' => array('Traders' => array(), 'TotalDamage' => 0));
-foreach($fightingPlayers['Attackers'] as $accountID => &$teamPlayer) {
+foreach ($fightingPlayers['Attackers'] as $accountID => $teamPlayer) {
 	$playerResults =& $teamPlayer->shootPlayers($fightingPlayers['Defenders']);
 	$results['Attackers']['Traders'][$teamPlayer->getAccountID()]  =& $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
-} unset($teamPlayer);
-foreach($fightingPlayers['Defenders'] as $accountID => &$teamPlayer) {
+}
+foreach ($fightingPlayers['Defenders'] as $accountID => $teamPlayer) {
 	$playerResults =& $teamPlayer->shootPlayers($fightingPlayers['Attackers']);
 	$results['Defenders']['Traders'][$teamPlayer->getAccountID()]  =& $playerResults;
 	$results['Defenders']['TotalDamage'] += $playerResults['TotalDamage'];
-} unset($teamPlayer);
+}
 $ship->removeUnderAttack(); //Don't show attacker the under attack message.
 
 $account->log(LOG_TYPE_TRADER_COMBAT, 'Player attacks player, their team does ' . $results['Attackers']['TotalDamage'].' and the other team does '.$results['Defenders']['TotalDamage'], $sector->getSectorID());
diff --git a/templates/Default/engine/Default/GalaxyMap.inc b/templates/Default/engine/Default/GalaxyMap.inc
index 0f894564a..9c2e448f1 100644
--- a/templates/Default/engine/Default/GalaxyMap.inc
+++ b/templates/Default/engine/Default/GalaxyMap.inc
@@ -24,12 +24,12 @@
 						<form name="GalaxyMapForm" method="GET">
 							<label for="galaxy_id">Switch galaxy</label>&nbsp;
 							<select name="galaxy_id" id="galaxy_id" onchange="this.form.submit()"><?php
-								foreach($GameGalaxies as &$GameGalaxy) {
+								foreach ($GameGalaxies as $GameGalaxy) {
 									$GalaxyID = $GameGalaxy->getGalaxyID(); ?>
 									<option value="<?php echo $GalaxyID; ?>"<?php if($ThisGalaxy->equals($GameGalaxy)){ ?> selected="selected"<?php } ?>>
 									<?php echo $GameGalaxy->getName(); ?>
 									</option><?php
-								} unset($GameGalaxy); ?>
+								} ?>
 							</select>&nbsp;
 							<input type="submit" value="View"/>
 						</form>
diff --git a/templates/Default/engine/Default/alliance_message_view.php b/templates/Default/engine/Default/alliance_message_view.php
index 889c50f8a..33df81758 100644
--- a/templates/Default/engine/Default/alliance_message_view.php
+++ b/templates/Default/engine/Default/alliance_message_view.php
@@ -38,7 +38,7 @@
 				?><th></th><?php
 			} ?>
 		</tr><?php
-		foreach($Thread['Replies'] as &$Reply) { ?>
+		foreach ($Thread['Replies'] as $Reply) { ?>
 			<tr>
 				<td class="shrink noWrap top"><?php echo $Reply['Sender']; ?></td>
 				<td><?php echo bbifyMessage($Reply['Message']); ?></td>
@@ -47,7 +47,7 @@
 					?><td class="shrink noWrap top"><a href="<?php echo $Reply['DeleteHref']; ?>"><img src="images/silk/cross.png" width="16" height="16" alt="Delete" title="Delete Post"/></a></td><?php
 				} ?>
 			</tr><?php
-		} unset($Reply); ?>
+		} ?>
 	</table>
 </div><?php
 if(isset($Thread['CreateThreadReplyFormHref'])) { ?>
@@ -63,4 +63,4 @@
 		<input class="submit" type="submit" name="action" value="Create Reply">&nbsp;<input type="submit" name="action" value="Preview Reply" id="InputFields" />
 	</form><?php
 }
-?>
\ No newline at end of file
+?>
diff --git a/templates/Default/engine/Default/course_plot.php b/templates/Default/engine/Default/course_plot.php
index 8c873322b..bc8487c93 100644
--- a/templates/Default/engine/Default/course_plot.php
+++ b/templates/Default/engine/Default/course_plot.php
@@ -32,24 +32,24 @@
 		<select name="X" id="InputFields" onchange="this.form.submit()"><?php
 			switch($XType) {
 				case 'Technology':
-					$Hardwares =& Globals::getHardwareTypes();
-					foreach($Hardwares as &$Hardware) {
+					$Hardwares = Globals::getHardwareTypes();
+					foreach ($Hardwares as $Hardware) {
 						?><option value="<?php echo $Hardware['ID']; ?>"><?php echo $Hardware['Name']; ?></option><?php
-					} unset($Hardware);
+					}
 				break;
 				case 'Ships':
-					$Ships =& AbstractSmrShip::getAllBaseShips(Globals::getGameType($ThisPlayer->getGameID()));
+					$Ships = AbstractSmrShip::getAllBaseShips(Globals::getGameType($ThisPlayer->getGameID()));
 					Sorter::sortByNumElement($Ships, 'Name');
-					foreach($Ships as &$Ship) {
+					foreach ($Ships as $Ship) {
 						?><option value="<?php echo $Ship['ShipTypeID']; ?>"><?php echo $Ship['Name']; ?></option><?php
-					} unset($Ship);
+					}
 				break;
 				case 'Weapons':
-					$Weapons =& SmrWeapon::getAllWeapons(Globals::getGameType($ThisPlayer->getGameID()));
+					$Weapons = SmrWeapon::getAllWeapons(Globals::getGameType($ThisPlayer->getGameID()));
 					Sorter::sortByNumMethod($Weapons, 'getName');
-					foreach($Weapons as &$Weapon) {
+					foreach ($Weapons as $Weapon) {
 						?><option value="<?php echo $Weapon->getWeaponTypeID(); ?>"><?php echo $Weapon->getName(); ?></option><?php
-					} unset($Weapon);
+					}
 				break;
 				case 'Locations':
 					?><option value="Bank">Any Bank</option>
@@ -61,11 +61,11 @@
 					<option value="Hardware">Any Hardware Shop</option>
 					<option value="Ship">Any Ship Shop</option>
 					<option value="Weapon">Any Weapon Shop</option><?php
-					$Locations =& SmrLocation::getAllLocations();
+					$Locations = SmrLocation::getAllLocations();
 					Sorter::sortByNumMethod($Locations, 'getName');
-					foreach($Locations as &$Location) {
+					foreach ($Locations as $Location) {
 						?><option value="<?php echo $Location->getTypeID(); ?>"><?php echo $Location->getName(); ?></option><?php
-					} unset($Location);
+					}
 				break;
 				case 'Sell Goods':
 				case 'Buy Goods':
@@ -75,10 +75,10 @@
 					}
 				break;
 				case 'Galaxies':
-					$Galaxies =& SmrGalaxy::getGameGalaxies($ThisPlayer->getGameID());
-					foreach($Galaxies as &$Galaxy) {
+					$Galaxies = SmrGalaxy::getGameGalaxies($ThisPlayer->getGameID());
+					foreach ($Galaxies as $Galaxy) {
 						?><option value="<?php echo $Galaxy->getGalaxyID(); ?>"><?php echo $Galaxy->getName(); ?></option><?php
-					} unset($Galaxy);
+					}
 				break;
 				default:
 			} ?>
diff --git a/templates/Default/engine/Default/feature_request.php b/templates/Default/engine/Default/feature_request.php
index bd8204296..b0c1ba248 100644
--- a/templates/Default/engine/Default/feature_request.php
+++ b/templates/Default/engine/Default/feature_request.php
@@ -40,7 +40,7 @@
 					?><th width="20">&nbsp;</th><?php
 				} ?>
 			</tr><?php
-			foreach($FeatureRequests as &$FeatureRequest) { ?>
+			foreach ($FeatureRequests as $FeatureRequest) { ?>
 				<tr class="center"><?php
 					if($FeatureModerator) {
 						?><td><?php echo $FeatureRequest['RequestAccount']->getLogin(); ?>&nbsp;(<?php echo $FeatureRequest['RequestAccount']->getAccountID(); ?>)</td><?php
@@ -57,7 +57,7 @@
 						?><td valign="middle" align="center"><input type="checkbox" name="set_status_ids[]" value="<?php echo $FeatureRequest['RequestID']; ?>"></td><?php
 					} ?>
 				</tr><?php
-			} unset($FeatureRequest); ?>
+			} ?>
 		</table>
 		<div align="right"><?php
 			if($FeatureModerator) { ?>&nbsp;
diff --git a/templates/Default/engine/Default/feature_request_comments.php b/templates/Default/engine/Default/feature_request_comments.php
index 6614f050c..e152beea6 100644
--- a/templates/Default/engine/Default/feature_request_comments.php
+++ b/templates/Default/engine/Default/feature_request_comments.php
@@ -6,7 +6,7 @@
 			<th>Comment</th>
 			<th>Time</th>
 		</tr><?php
-		foreach($Comments as &$Comment) { ?>
+		foreach ($Comments as $Comment) { ?>
 			<tr class="center">
 				<td class="shrink noWrap top"><?php
 				if($Comment['Anonymous']) {
@@ -21,7 +21,7 @@
 				<td class="left"><?php echo bbifyMessage($Comment['Message']); ?></td>
 				<td class="shrink noWrap top"><?php echo $Comment['Time']; ?></td>
 			</tr><?php
-		} unset($Comment); ?>
+		} ?>
 	</table><?php
 }
 
diff --git a/templates/Default/engine/Default/game_stats.php b/templates/Default/engine/Default/game_stats.php
index 70ee8d876..a53d98e16 100644
--- a/templates/Default/engine/Default/game_stats.php
+++ b/templates/Default/engine/Default/game_stats.php
@@ -129,13 +129,13 @@
 							<th align="center">Player</th>
 							<th align="center">Experience</th>
 						</tr><?php
-						foreach($ExperienceRankings as $Rank => &$RankedPlayer) { ?>
+						foreach ($ExperienceRankings as $Rank => $RankedPlayer) { ?>
 							<tr>
 								<td align="center"><?php echo $Rank; ?></td>
 								<td align="center"><?php echo $RankedPlayer->getPlayerName(); ?></td>
 								<td align="center"><?php echo number_format($RankedPlayer->getExperience()); ?></td>
 							</tr><?php
-						} unset($RankedPlayer); ?>
+						} ?>
 					</table><?php
 				} ?>
 			</td>
@@ -147,13 +147,13 @@
 							<th align="center">Player</th>
 							<th align="center">Kills</th>
 						</tr><?php
-						foreach($KillRankings as $Rank => &$RankedPlayer) { ?>
+						foreach ($KillRankings as $Rank => $RankedPlayer) { ?>
 							<tr>
 								<td align="center"><?php echo $Rank; ?></td>
 								<td align="center"><?php echo $RankedPlayer->getPlayerName(); ?></td>
 								<td align="center"><?php echo number_format($RankedPlayer->getKills()); ?></td>
 							</tr><?php
-						} unset($RankedPlayer); ?>
+						} ?>
 					</table><?php
 				} ?>
 			</td>
diff --git a/templates/Default/engine/Default/includes/RightPanelShip.inc b/templates/Default/engine/Default/includes/RightPanelShip.inc
index 8b96cf4c2..2dc93cdef 100644
--- a/templates/Default/engine/Default/includes/RightPanelShip.inc
+++ b/templates/Default/engine/Default/includes/RightPanelShip.inc
@@ -80,10 +80,9 @@ if(isset($GameID)) { ?>
 			<noscript><a href="<?php echo $ThisPlayer->getToggleWeaponHidingHREF(); ?>"></noscript>
 				Show/Hide (<?php echo $ThisShip->getNumWeapons(); ?>)<br />
 				<span class="wep1"<?php if(!$ThisPlayer->isDisplayWeapons()){ ?>style="display: none;"<?php } ?>><?php
-					$Weapons =& $ThisShip->getWeapons();
-					foreach($Weapons as &$Weapon) { 
+					foreach ($ThisShip->getWeapons() as $Weapon) {
 						echo $Weapon->getName(); ?><br /><?php
-					} unset($Weapon); unset($Weapons); ?>
+					} ?>
 				</span>
 			<noscript></a></noscript>
 		</div><?php
diff --git a/templates/Default/engine/Default/includes/SectorMap.inc b/templates/Default/engine/Default/includes/SectorMap.inc
index 2b18a9d92..a9370e702 100644
--- a/templates/Default/engine/Default/includes/SectorMap.inc
+++ b/templates/Default/engine/Default/includes/SectorMap.inc
@@ -3,9 +3,9 @@
 	$UniGen = isset($UniGen) ? $UniGen : false;
 	$MapPlayer = $UniGen ? null : $ThisPlayer;
 	$MovementTypes = array('Up','Left','Right','Down');
-	foreach($MapSectors as &$MapSector) { ?>
+	foreach ($MapSectors as $MapSector) { ?>
 		<tr><?php
-			foreach($MapSector as &$Sector) {
+			foreach ($MapSector as $Sector) {
 				$isCurrentSector = !$UniGen && $ThisSector->equals($Sector);
 				$isLinkedSector = !$UniGen && $ThisSector->isLinkedSector($Sector);
 				$isSeedlistSector = !$UniGen && isset($ShowSeedlistSectors) && $ShowSeedlistSectors && $MapPlayer->getAlliance()->isInSeedlist($Sector);
@@ -149,11 +149,11 @@
 						} ?>
 					</div>
 				</td><?php
-			} unset($Sector); ?>
+			} ?>
 		</tr><?php
 		//A little hacky but clearing these caches for each row of gal map drastically reduces total memory usage, and these caches should never be needed after this point either.
 		SmrPort::clearCache();
 		SmrForce::clearCache();
 		SmrPlanet::clearCache();
-	} unset($MapSector); ?>
+	} ?>
 </table>
diff --git a/templates/Default/engine/Default/shop_ship.php b/templates/Default/engine/Default/shop_ship.php
index 7908a78ee..a076a07d7 100644
--- a/templates/Default/engine/Default/shop_ship.php
+++ b/templates/Default/engine/Default/shop_ship.php
@@ -7,7 +7,7 @@
 			<th>Cost</th>
 			<th>Action</th>
 		</tr><?php
-		foreach($ShipsSold as &$ShipSold) { ?>
+		foreach ($ShipsSold as $ShipSold) { ?>
 			<tr>
 				<td><?php echo $ShipSold['Name']; ?></td>
 				<td><?php echo $ShipSold['Cost']; ?></td>
@@ -17,7 +17,7 @@
 					</div>
 				</td>
 			</tr><?php
-		} unset($ShipSold);
+		}
 	?></table><?php
 }
 else {
@@ -148,4 +148,4 @@
 			</td>
 		</tr>
 	</table><?php
-} ?>
\ No newline at end of file
+} ?>
diff --git a/templates/Default/engine/Default/shop_weapon.php b/templates/Default/engine/Default/shop_weapon.php
index 274d1caf7..53f2d13a0 100644
--- a/templates/Default/engine/Default/shop_weapon.php
+++ b/templates/Default/engine/Default/shop_weapon.php
@@ -15,8 +15,7 @@
 		</thead>
 
 		<tbody class="list"><?php
-			$WeaponsSold =& $ThisLocation->getWeaponsSold();
-			foreach($WeaponsSold as &$Weapon) { ?>
+			foreach ($ThisLocation->getWeaponsSold() as $Weapon) { ?>
 				<tr>
 					<td class="sort_name"><?php echo $Weapon->getName(); ?></td>
 					<td class="sort_shield"><?php echo $Weapon->getShieldDamage(); ?></td>
@@ -28,7 +27,7 @@
 					<td><a href="<?php echo $Weapon->getBuyHREF($ThisLocation); ?>" class="submitStyle">Buy</a></td>
 					</td>
 				</tr><?php
-			} unset($Weapon);?>
+			} ?>
 		</tbody>
 	</table>
 
@@ -53,13 +52,12 @@
 			<th>Cash</th>
 			<th>Action</th>
 		</tr><?php
-		$ShipWeapons =& $ThisShip->getWeapons();
-		foreach ($ShipWeapons as $OrderID => &$Weapon) { ?>
+		foreach ($ThisShip->getWeapons() as $OrderID => $Weapon) { ?>
 			<tr class="center">
 				<td><?php echo $Weapon->getName(); ?></td>
 				<td><?php echo number_format(floor($Weapon->getCost() * WEAPON_REFUND_PERCENT)); ?></td>
 				<td><a href="<?php echo $Weapon->getSellHREF($ThisLocation, $OrderID); ?>" class="submitStyle">Sell</a></td>
 			</tr><?php
-		} unset($Weapon); ?>
+		} ?>
 	</table><?php
 } ?>