diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 762cbca0098..1edbbfdf9a8 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1673,22 +1673,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
         }
 
         VlanType vlanType = forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached;
-        
-
-        //check for hypervisor type to be xenserver
-		String hypervisorType = _configDao.getValue("hypervisor.type");
-				
-		if(hypervisorType.equalsIgnoreCase("xenserver")) {
-	    	//check for the vlan being added before going to db, to see if it is untagged
-	    	if(vlanType.toString().equalsIgnoreCase("VirtualNetwork") && vlanId.equalsIgnoreCase(Vlan.UNTAGGED))
-	    	{
-	    		if(_configDao.getValue("xen.public.network.device") == null || _configDao.getValue("xen.public.network.device").equals(""))
-	    		{
-	    			throw new CloudRuntimeException("For adding an untagged IP range, please set up xen.public.network.device");
-	    		}
-	    	}
-		}
-
+      
         //ACL check
         checkAccess(account, zone);
 
diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/com/cloud/server/ManagementServer.java
index 558cc41a5f9..84e454b2239 100755
--- a/server/src/com/cloud/server/ManagementServer.java
+++ b/server/src/com/cloud/server/ManagementServer.java
@@ -514,11 +514,6 @@ public interface ManagementServer extends ManagementService {
      */
     SecurityGroupVO findNetworkGroupById(long networkGroupId);
 
-	/**
-	 * Is the hypervisor snapshot capable.
-	 * @return True if the hypervisor.type is XenServer
-	 */
-	boolean isHypervisorSnapshotCapable();
 	List<String> searchForStoragePoolDetails(long poolId, String value);
 	
 	boolean checkLocalStorageConfigVal(); 
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 7491df7ee83..4b10902d583 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -343,7 +343,6 @@ public class ManagementServerImpl implements ManagementServer {
     
     private final Map<String, Boolean> _availableIdsMap;
 
-    private final boolean _isHypervisorSnapshotCapable = false;
     private String _hashKey = null;    
     
     protected ManagementServerImpl() {
@@ -4081,14 +4080,6 @@ public class ManagementServerImpl implements ManagementServer {
         return groupVO;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isHypervisorSnapshotCapable() {
-        return _isHypervisorSnapshotCapable;
-    }
-    
     @Override
     public List<EventVO> listPendingEvents(int entryTime, int duration) {
         Calendar calMin = Calendar.getInstance();
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
index 6e5eba33744..b14941ea0f1 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -60,7 +60,6 @@ import com.cloud.utils.db.Transaction;
 @Local(value={VMTemplateDao.class})
 public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implements VMTemplateDao {
     private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class);
-    private HypervisorType _defaultHyperType;
     
     @Inject
     VMTemplateZoneDao _templateZoneDao;
@@ -241,7 +240,6 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
 		tmpltZoneSearch.done();
 		TmpltsInZoneSearch.done();
 			
-		_defaultHyperType = HypervisorType.getType(_configDao.getValue("hypervisor.type"));
 		return result;
 	}
 
diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index bfb8939f492..f6c99a4cbad 100755
--- a/server/src/com/cloud/test/DatabaseConfig.java
+++ b/server/src/com/cloud/test/DatabaseConfig.java
@@ -341,7 +341,6 @@ public class DatabaseConfig {
         s_defaultConfigurationValues.put("use.local.storage", "false");
         s_defaultConfigurationValues.put("init", "false");
 //        s_defaultConfigurationValues.put("network.type", "vnet");
-        s_defaultConfigurationValues.put("hypervisor.type", "kvm");
     }
     
     protected DatabaseConfig() {