diff --git a/include/Group.h b/include/Group.h
index 601a8a0152..3554cfe334 100644
--- a/include/Group.h
+++ b/include/Group.h
@@ -161,10 +161,7 @@ private:
         obj_template = new Template;
     };
 
-    virtual ~Group()
-    {
-        delete obj_template;
-    };
+    virtual ~Group(){};
 
     // *************************************************************************
     // Administrators
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index 998b1cb796..d5a0caa131 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -136,6 +136,8 @@ public:
 
     virtual ~PoolObjectSQL()
     {
+        delete obj_template;
+
         pthread_mutex_unlock(&mutex);
 
         pthread_mutex_destroy(&mutex);
diff --git a/include/User.h b/include/User.h
index c19d1f1a28..d3ae755b3c 100644
--- a/include/User.h
+++ b/include/User.h
@@ -376,10 +376,7 @@ protected:
         obj_template = new UserTemplate;
     };
 
-    virtual ~User()
-    {
-        delete obj_template;
-    };
+    virtual ~User(){};
 
     // *************************************************************************
     // DataBase implementation
diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc
index 743b04862f..def084789a 100644
--- a/src/datastore/Datastore.cc
+++ b/src/datastore/Datastore.cc
@@ -68,10 +68,7 @@ Datastore::Datastore(
     group_u = 1;
 }
 
-Datastore::~Datastore()
-{
-    delete obj_template;
-};
+Datastore::~Datastore(){};
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
diff --git a/src/document/Document.cc b/src/document/Document.cc
index 6354889b02..d2fc095a8c 100644
--- a/src/document/Document.cc
+++ b/src/document/Document.cc
@@ -45,10 +45,7 @@ Document::Document( int id,
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-Document::~Document()
-{
-    delete obj_template;
-}
+Document::~Document(){};
 
 /* ************************************************************************ */
 /* Document :: Database Access Functions                                    */
diff --git a/src/host/Host.cc b/src/host/Host.cc
index 39501994bd..17d3f856e0 100644
--- a/src/host/Host.cc
+++ b/src/host/Host.cc
@@ -51,10 +51,7 @@ Host::Host(
     replace_template_attribute("VM_MAD", vmm_mad_name);
 }
 
-Host::~Host()
-{
-    delete obj_template;
-}
+Host::~Host(){};
 
 /* ************************************************************************ */
 /* Host :: Database Access Functions                                        */
diff --git a/src/image/Image.cc b/src/image/Image.cc
index 5785691bc7..005557172c 100644
--- a/src/image/Image.cc
+++ b/src/image/Image.cc
@@ -62,23 +62,20 @@ Image::Image(int             _uid,
         app_clone_collection("APP_CLONES"),
         snapshots(-1, false),
         target_snapshot(-1)
-{
-    if (_image_template != 0)
     {
-        obj_template = _image_template;
-    }
-    else
-    {
-        obj_template = new ImageTemplate;
+        if (_image_template != 0)
+        {
+            obj_template = _image_template;
+        }
+        else
+        {
+            obj_template = new ImageTemplate;
+        }
+
+        set_umask(_umask);
     }
 
-    set_umask(_umask);
-}
-
-Image::~Image()
-{
-    delete obj_template;
-}
+Image::~Image(){};
 
 /* ************************************************************************ */
 /* Image :: Database Access Functions                                       */
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index 883e19ea81..b321b5c154 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -65,10 +65,7 @@ MarketPlace::MarketPlace(
     set_umask(umask);
 };
 
-MarketPlace::~MarketPlace()
-{
-    delete obj_template;
-};
+MarketPlace::~MarketPlace(){};
 
 /* *************************************************************************** */
 /* MartketPlace :: Database Access Functions                                   */
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 936c88c922..4f35b7a07a 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -69,10 +69,7 @@ MarketPlaceApp::MarketPlaceApp(
     set_umask(umask);
 };
 
-MarketPlaceApp::~MarketPlaceApp()
-{
-    delete obj_template;
-};
+MarketPlaceApp::~MarketPlaceApp(){};
 
 /* ************************************************************************ */
 /* MartketPlaceApp:: Database Access Functions                              */
diff --git a/src/secgroup/SecurityGroup.cc b/src/secgroup/SecurityGroup.cc
index 5fd5d6dbbe..71fec0cad2 100644
--- a/src/secgroup/SecurityGroup.cc
+++ b/src/secgroup/SecurityGroup.cc
@@ -63,10 +63,7 @@ SecurityGroup::SecurityGroup(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-SecurityGroup::~SecurityGroup()
-{
-    delete obj_template;
-};
+SecurityGroup::~SecurityGroup(){};
 
 /* ************************************************************************ */
 /* SecurityGroup :: Database Access Functions                               */
diff --git a/src/vdc/Vdc.cc b/src/vdc/Vdc.cc
index 57272ac8f9..79c34a59be 100644
--- a/src/vdc/Vdc.cc
+++ b/src/vdc/Vdc.cc
@@ -55,10 +55,7 @@ Vdc::Vdc(int id, Template* vdc_template):
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-Vdc::~Vdc()
-{
-    delete obj_template;
-};
+Vdc::~Vdc(){};
 
 /* ************************************************************************ */
 /* Vdc :: Database Access Functions                                         */
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 367586e3b6..9379f4d0fd 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -89,7 +89,6 @@ VirtualMachine::~VirtualMachine()
     }
 
     delete _log;
-    delete obj_template;
     delete user_obj_template;
 }
 
diff --git a/src/vm_group/VMGroup.cc b/src/vm_group/VMGroup.cc
index c88a8d6346..9cb2b5d176 100644
--- a/src/vm_group/VMGroup.cc
+++ b/src/vm_group/VMGroup.cc
@@ -52,10 +52,7 @@ VMGroup::VMGroup(int _uid, int _gid, const string& _uname, const string& _gname,
     set_umask(_umask);
 }
 
-VMGroup::~VMGroup()
-{
-    delete obj_template;
-}
+VMGroup::~VMGroup(){};
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc
index 23d9a7317d..8234e25e97 100644
--- a/src/vm_template/VMTemplate.cc
+++ b/src/vm_template/VMTemplate.cc
@@ -47,10 +47,7 @@ VMTemplate::VMTemplate(int id,
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-VMTemplate::~VMTemplate()
-{
-    delete obj_template;
-}
+VMTemplate::~VMTemplate(){};
 
 /* ************************************************************************ */
 /* VMTemplate :: Database Access Functions                                  */
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 3be71bec71..a2a25f34dc 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -64,10 +64,7 @@ VirtualNetwork::VirtualNetwork(int                      _uid,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-VirtualNetwork::~VirtualNetwork()
-{
-    delete obj_template;
-}
+VirtualNetwork::~VirtualNetwork(){};
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index f13381bba6..9e0d889689 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -69,10 +69,7 @@ VirtualRouter::VirtualRouter(   int             id,
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-VirtualRouter::~VirtualRouter()
-{
-    delete obj_template;
-}
+VirtualRouter::~VirtualRouter(){};
 
 /* ************************************************************************ */
 /* VirtualRouter :: Database Access Functions                                    */
diff --git a/src/zone/Zone.cc b/src/zone/Zone.cc
index 62328c9d10..224f878704 100644
--- a/src/zone/Zone.cc
+++ b/src/zone/Zone.cc
@@ -55,8 +55,6 @@ Zone::Zone(int id, Template* zone_template):
 
 Zone::~Zone()
 {
-    delete obj_template;
-
     delete servers;
 };