diff --git a/src/gcal-manager.c b/src/gcal-manager.c
index 40751774..f280d41c 100644
--- a/src/gcal-manager.c
+++ b/src/gcal-manager.c
@@ -90,8 +90,6 @@ enum
 
 static guint signals[LAST_SIGNAL];
 
-void            free_manager_unit_data                    (gpointer         data);
-
 static void     load_source                               (GcalManager     *manager,
                                                            ESource         *source);
 
@@ -201,18 +199,6 @@ submit_thread_job (EThreadJobFunc func,
 }
 /* -- end: threading related code provided by Milan Crha -- */
 
-void
-free_manager_unit_data (gpointer data)
-{
-  GcalManagerUnit *unit;
-
-  unit = (GcalManagerUnit*) data;
-
-  g_clear_object (&(unit->client));
-
-  g_free (unit);
-}
-
 /**
  * load_source:
  * @manager: Manager instance
@@ -468,6 +454,9 @@ gcal_manager_finalize (GObject *object)
   if (priv->final_date != NULL)
     g_free (priv->final_date);
 
+  if (priv->e_data_model != NULL)
+    g_object_unref (priv->e_data_model);
+
   g_hash_table_destroy (priv->clients);
 }