diff --git a/core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
index 040e790bef9..d28fb516c76 100755
--- a/core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
+++ b/core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
@@ -45,7 +45,6 @@ public interface VmwareManager {
 	void gcLeftOverVMs(VmwareContext context);
 	
 	Pair<Integer, Integer> getAddiionalVncPortRange();
-	VirtualEthernetCardType getGuestNicDeviceType();
 	
 	int getMaxHostsPerCluster();
 	
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index b84e3fb468c..bff71425de2 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -226,7 +226,7 @@ public enum Config {
     VmwareManagementPortGroup("Advanced", ManagementServer.class, String.class, "vmware.management.portgroup", "Management Network", "Specify the management network name(for ESXi hosts)", null),
     VmwareAdditionalVncPortRangeStart("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.start", "59000", "Start port number of additional VNC port range", null),
     VmwareAdditionalVncPortRangeSize("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.size", "1000", "Start port number of additional VNC port range", null),
-    VmwareGuestNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.guest.nic.device.type", "E1000", "Ethernet card type used in guest VM, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null),
+    //VmwareGuestNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.guest.nic.device.type", "E1000", "Ethernet card type used in guest VM, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null),
     VmwarePerClusterHostMax("Advanced", ManagementServer.class, Integer.class, "vmware.percluster.host.max", "8", "maxmium hosts per vCenter cluster(do not let it grow over 8)", "1-8"),
     VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu", "false", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null),
     VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem", "false", "Specify whether or not to reserve memory based on memory overprovisioning factor", null),
diff --git a/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java b/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java
index a1ba9c9ff72..3533002661e 100755
--- a/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java
+++ b/server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java
@@ -112,7 +112,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
     String _managemetPortGroupName;
     int _additionalPortRangeStart;
     int _additionalPortRangeSize;
-    VirtualEthernetCardType _guestNicDeviceType;
     int _maxHostsPerCluster;
     
     String _cpuOverprovisioningFactor = "1";
@@ -245,18 +244,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
         
     	s_logger.info("Additional VNC port allocation range is settled at " + _additionalPortRangeStart + " to " + (_additionalPortRangeStart + _additionalPortRangeSize));
 
-    	value = configDao.getValue(Config.VmwareGuestNicDeviceType.key());
-    	if(value == null || "E1000".equalsIgnoreCase(value))
-    		this._guestNicDeviceType = VirtualEthernetCardType.E1000;
-    	else if("PCNet32".equalsIgnoreCase(value))
-    		this._guestNicDeviceType = VirtualEthernetCardType.PCNet32;
-    	else if("Vmxnet2".equalsIgnoreCase(value))
-    		this._guestNicDeviceType = VirtualEthernetCardType.Vmxnet2;
-    	else if("Vmxnet3".equalsIgnoreCase(value))
-    		this._guestNicDeviceType = VirtualEthernetCardType.Vmxnet3;
-    	else
-    		this._guestNicDeviceType = VirtualEthernetCardType.E1000;
-    	
         value = configDao.getValue("vmware.host.scan.interval");
         _hostScanInterval = NumbersUtil.parseLong(value, DEFAULT_HOST_SCAN_INTERVAL);
         s_logger.info("VmwareManagerImpl config - vmware.host.scan.interval: " + _hostScanInterval);
@@ -832,11 +819,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
     	return new Pair<Integer, Integer>(_additionalPortRangeStart, _additionalPortRangeSize);
     }
     
-    @Override
-	public VirtualEthernetCardType getGuestNicDeviceType() {
-    	return this._guestNicDeviceType;
-    }
-    
     @Override
     public int getMaxHostsPerCluster() {
     	return this._maxHostsPerCluster;
diff --git a/setup/db/db/schema-2211to2212.sql b/setup/db/db/schema-2211to2212.sql
index 6eafa4b9ab5..1915b09a44e 100644
--- a/setup/db/db/schema-2211to2212.sql
+++ b/setup/db/db/schema-2211to2212.sql
@@ -10,3 +10,5 @@ INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-serv
 
 ALTER IGNORE TABLE `cloud`.`user_vm_details` DROP FOREIGN KEY `fk_user_vm_details__vm_id`;
 ALTER TABLE `cloud`.`user_vm_details` ADD CONSTRAINT `fk_user_vm_details__vm_id` FOREIGN KEY `fk_user_vm_details__vm_id`(`vm_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE;
+
+DELETE FROM `cloud`.`configuration` where name='vmware.guest.nic.device.type';