diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
index 284380eb194..3021b8f956f 100644
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
@@ -30,5 +30,7 @@ public interface VMTemplateDetailsDao extends GenericDao<VMTemplateDetailVO, Lon
 
     void deleteDetails(long vmId);
     
-    void addTemplateDetail(Long templateId, String key, String value);
+    void addTemplateDetail(long templateId, String key, String value);
+    
+    void removeDetails(long templateId, String key);
 }
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
index 34b5cc542d8..f1af0d05fec 100644
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
@@ -98,7 +98,7 @@ public class VMTemplateDetailsDaoImpl extends GenericDaoBase<VMTemplateDetailVO,
     }
     
     @Override
-    public void addTemplateDetail(Long templateId, String key, String value) {
+    public void addTemplateDetail(long templateId, String key, String value) {
         VMTemplateDetailVO detail = findDetail(templateId, key);
         if (detail == null) {
             VMTemplateDetailVO newEntry = new VMTemplateDetailVO(templateId, key, value);
@@ -108,4 +108,16 @@ public class VMTemplateDetailsDaoImpl extends GenericDaoBase<VMTemplateDetailVO,
             update(detail.getId(), detail);
         }
     }
+    
+    @Override
+    public void removeDetails(long templateId, String key) {
+        if(key != null){
+            VMTemplateDetailVO detail = findDetail(templateId, key);
+            if(detail != null){
+                remove(detail.getId());
+            }
+        } else {
+            deleteDetails(templateId);
+        }
+    }
 }
diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailDao.java b/engine/schema/src/com/cloud/vm/dao/NicDetailDao.java
index 38eb2f2a3b1..66bff167fbf 100644
--- a/engine/schema/src/com/cloud/vm/dao/NicDetailDao.java
+++ b/engine/schema/src/com/cloud/vm/dao/NicDetailDao.java
@@ -31,5 +31,5 @@ public interface NicDetailDao extends GenericDao<NicDetailVO, Long> {
 
     void deleteDetails(long nicId);
 
-    void removeDetails(Long id, String key);
+    void removeDetails(long nicId, String key);
 }
diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java
index 033acca34ec..4c1d59cbd5e 100644
--- a/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java
@@ -89,8 +89,7 @@ public class NicDetailDaoImpl extends GenericDaoBase<NicDetailVO, Long> implemen
     }
 
     @Override
-    public void removeDetails(Long nicId, String key) {
-
+    public void removeDetails(long nicId, String key) {
         if(key != null){
             NicDetailVO detail = findDetail(nicId, key);
             if(detail != null){
@@ -99,7 +98,6 @@ public class NicDetailDaoImpl extends GenericDaoBase<NicDetailVO, Long> implemen
         }else {
             deleteDetails(nicId);
         }
-
     }
     
 }
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
index 02e5563fe9c..ce36c0bd823 100644
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
@@ -32,8 +32,8 @@ public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long> {
     UserVmDetailVO findDetail(long vmId, String name);
     
 	void deleteDetails(long vmId);
-
-    public void removeDetails(Long vmId, String key);
 	
-    void addVmDetail(Long vmId, String key, String value);
+    void addVmDetail(long vmId, String key, String value);
+    
+    void removeDetails(long vmId, String key);
 }
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
index 6cf9baf1309..67b7f81f5df 100644
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
@@ -106,20 +106,7 @@ public class UserVmDetailsDaoImpl extends GenericDaoBase<UserVmDetailVO, Long> i
 	}
 
     @Override
-    public void removeDetails(Long vmId, String key) {
-        if(key != null){
-            UserVmDetailVO detail = findDetail(vmId, key);
-            if(detail != null){
-                remove(detail.getId());
-            }
-        }else {
-            deleteDetails(vmId);
-        }
-
-    }
-
-    @Override
-    public void addVmDetail(Long vmId, String key, String value) {
+    public void addVmDetail(long vmId, String key, String value) {
         UserVmDetailVO detail = findDetail(vmId, key);
         if (detail == null) {
             UserVmDetailVO newEntry = new UserVmDetailVO(vmId, key, value);
@@ -129,4 +116,16 @@ public class UserVmDetailsDaoImpl extends GenericDaoBase<UserVmDetailVO, Long> i
             update(detail.getId(), detail);
         }
     }
+
+    @Override
+    public void removeDetails(long vmId, String key) {
+        if(key != null){
+            UserVmDetailVO detail = findDetail(vmId, key);
+            if(detail != null){
+                remove(detail.getId());
+            }
+        }else {
+            deleteDetails(vmId);
+        }
+    }
 }
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 58f2bf5bbb9..4159a8006ee 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -152,16 +152,16 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
         }
         
         // TODO - Have a better design here.
-        if(resourceType == ResourceObjectType.Volume){
+        if (resourceType == ResourceObjectType.Volume){
            _volumeDetailDao.removeDetails(id, key);
-        } else if(resourceType == ResourceObjectType.Nic){
+        } else if (resourceType == ResourceObjectType.Nic){
             _nicDetailDao.removeDetails(id, key);
-        } else if(resourceType == ResourceObjectType.UserVm){
-            _userVmDetailDao.removeDetails(id, key);
+        } else if (resourceType == ResourceObjectType.UserVm) {
+            _userVmDetailsDao.removeDetails(id, key); 
+        } else if (resourceType == ResourceObjectType.Template) {
+            _templateDetailsDao.removeDetails(id, key);
         } else if (resourceType == ResourceObjectType.Zone){
             _dcDetailsDao.removeDetails(id, key);
-        } else if (resourceType == ResourceObjectType.Network){
-            _networkDetailsDao.removeDetails(id, key);
         }
 
         return true;