diff --git a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
index f11f17f1bb5..4f514a249a6 100644
--- a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
@@ -29,13 +29,6 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
 	String poolUuid;
 	long poolId;
 	
-	//
-	// Temporary hacking to make vmware work quickly, expose NFS raw information to allow
-	// agent do quick copy over NFS.
-	//
-	// provide storage URL (it contains all information to help agent resource to mount the
-	// storage if needed, example of such URL may be as following
-	// 		nfs://192.168.10.231/export/home/kelven/vmware-test/secondary
 	String secondaryStorageUrl;
 	String primaryStorageUrl;
 
diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index b823a323059..f1af114a036 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -41,10 +41,10 @@ import com.cloud.agent.api.PingStorageCommand;
 import com.cloud.agent.api.ReadyAnswer;
 import com.cloud.agent.api.ReadyCommand;
 import com.cloud.agent.api.SecStorageFirewallCfgCommand;
+import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
 import com.cloud.agent.api.SecStorageSetupCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupStorageCommand;
-import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
 import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand;
 import com.cloud.agent.api.storage.DeleteEntityDownloadURLCommand;
 import com.cloud.agent.api.storage.DeleteTemplateCommand;
@@ -56,8 +56,8 @@ import com.cloud.host.Host.Type;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.ServerResourceBase;
 import com.cloud.storage.Storage;
-import com.cloud.storage.StorageLayer;
 import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.StorageLayer;
 import com.cloud.storage.template.DownloadManager;
 import com.cloud.storage.template.DownloadManagerImpl;
 import com.cloud.storage.template.TemplateInfo;
@@ -118,13 +118,13 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
             return _dlMgr.handleDownloadCommand((DownloadProgressCommand)cmd);
         } else if (cmd instanceof DownloadCommand) {
             return _dlMgr.handleDownloadCommand((DownloadCommand)cmd);
-        }else if (cmd instanceof UploadCommand) {        	
+        } else if (cmd instanceof UploadCommand) {        	
             return _upldMgr.handleUploadCommand((UploadCommand)cmd);
-        }else if (cmd instanceof CreateEntityDownloadURLCommand){
+        } else if (cmd instanceof CreateEntityDownloadURLCommand){
             return _upldMgr.handleCreateEntityURLCommand((CreateEntityDownloadURLCommand)cmd);
-        }else if(cmd instanceof DeleteEntityDownloadURLCommand){
+        } else if(cmd instanceof DeleteEntityDownloadURLCommand){
             return _upldMgr.handleDeleteEntityDownloadURLCommand((DeleteEntityDownloadURLCommand)cmd);
-        }else if (cmd instanceof GetStorageStatsCommand) {
+        } else if (cmd instanceof GetStorageStatsCommand) {
         	return execute((GetStorageStatsCommand)cmd);
         } else if (cmd instanceof CheckHealthCommand) {
             return new CheckHealthAnswer((CheckHealthCommand)cmd, true);
diff --git a/setup/db/create-index-fk.sql b/setup/db/create-index-fk.sql
index 5cc40dc0274..23c07c059b4 100755
--- a/setup/db/create-index-fk.sql
+++ b/setup/db/create-index-fk.sql
@@ -137,8 +137,6 @@ ALTER TABLE `cloud`.`security_group_vm_map` ADD CONSTRAINT `fk_security_group_vm
 ALTER TABLE `cloud`.`op_nwgrp_work` ADD INDEX `i_op_nwgrp_work__instance_id`(`instance_id`);
 ALTER TABLE `cloud`.`op_nwgrp_work` ADD INDEX `i_op_nwgrp_work__mgmt_server_id`(`mgmt_server_id`);
 
-ALTER TABLE `cloud`.`host_master` ADD UNIQUE `i_host_master__service_address`(`service_address`);
-
 ALTER TABLE `cloud`.`instance_group` ADD CONSTRAINT `fk_instance_group__account_id` FOREIGN KEY `fk_instance_group__account_id` (`account_id`) REFERENCES `account` (`id`);
 
 ALTER TABLE `cloud`.`instance_group_vm_map` ADD CONSTRAINT `fk_instance_group_vm_map___group_id` FOREIGN KEY `fk_instance_group_vm_map___group_id` (`group_id`) REFERENCES `instance_group` (`id`) ON DELETE CASCADE;
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 58107211e5c..8571dea3a7d 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -77,7 +77,6 @@ DROP TABLE IF EXISTS `cloud`.`nics`;
 DROP TABLE IF EXISTS `cloud`.`networks`;
 DROP TABLE IF EXISTS `cloud`.`op_networks`;
 DROP TABLE IF EXISTS `cloud`.`network_offerings`;
-DROP TABLE IF EXISTS `cloud`.`host_master`;
 DROP TABLE IF EXISTS `cloud`.`hypervisor_properties`;
 DROP TABLE IF EXISTS `cloud`.`account_network_ref`;
 DROP TABLE IF EXISTS `cloud`.`instance_group`;
@@ -1271,15 +1270,6 @@ CREATE TABLE `cloud`.`op_vm_ruleset_log` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `cloud`.`host_master` (
-  `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `type` varchar(32) NOT NULL,
-  `service_address` varchar(255) NOT NULL,
-  `admin` varchar(32) NOT NULL,
-  `password` varchar(32),
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE `cloud`.`instance_group` (
   `id` bigint unsigned NOT NULL UNIQUE auto_increment,
   `account_id` bigint unsigned NOT NULL COMMENT 'owner.  foreign key to account table',