diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php
index e3b1313..568a873 100644
--- a/setup/wizard/steps/database.php
+++ b/setup/wizard/steps/database.php
@@ -775,7 +775,6 @@ class database extends Step
     	$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
     	$this->util->dbUtilities->query($dropPluginHelper);
 		$this->addServerPort();
-    	$this->util->dbUtilities->query($iserverPorts);
     	$updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
     	$this->util->dbUtilities->query($updateExternalBinaries);
     	$this->reBuildPaths();
diff --git a/setup/wizard/steps/install.php b/setup/wizard/steps/install.php
index 4971e19..e30ba6a 100644
--- a/setup/wizard/steps/install.php
+++ b/setup/wizard/steps/install.php
@@ -104,9 +104,7 @@ class install extends step
     public function installStep()
     {
 		$this->callHome();
-		// copy indexing directory if this is a migration
-		$this->setDataFromSession();
-		if ($this->util->isMigration()) {
+		if ($this->util->isMigration()) { // copy indexing directory if this is a migration
 			$migrateSessionData = $this->getDataFromPackage('migrate', 'installation'); 
 			$configSessionData = $this->getDataFromSession('configuration'); 
 			$src = $migrateSessionData['location'] . DS . 'var' . DS .  'indexes';