diff --git a/configure.ac b/configure.ac
index d3b3b5c..edee9e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,30 +137,6 @@ AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-d
 AC_SUBST(ERROR_CFLAGS)
 
 # -----------------------------------------------------------
-# Enable TPL
-# -----------------------------------------------------------
-
-# It needs to be defined before PKG_CHECK_MODULES calls
-AC_ARG_ENABLE(tpl,
-  AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the
-    empathy logger]), enable_tpl=$enableval, enable_tpl=no )
-AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes")
-
-if test x${enable_tpl} = xyes; then
-  AC_DEFINE(ENABLE_TPL, [], [Enable TPL code])
-fi
-
-if test "x$enable_tpl" = "xyes"; then
-  PKG_CHECK_MODULES(TPL,
-  [
-     telepathy-logger-0.1 >= $TELEPATHY_LOGGER
-  ])
-  AC_SUBST(TPL_CFLAGS)
-  AC_SUBST(TPL_LIBS)
-fi
-
-
-# -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
 
@@ -175,6 +151,7 @@ PKG_CHECK_MODULES(LIBEMPATHY,
    telepathy-farsight
    farsight2-0.10
    gstreamer-0.10
+   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
 ])
 
 PKG_CHECK_MODULES(LIBEMPATHYGTK,
@@ -190,6 +167,7 @@ PKG_CHECK_MODULES(LIBEMPATHYGTK,
    farsight2-0.10
    gstreamer-0.10
    gstreamer-interfaces-0.10
+   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
 ])
 
 PKG_CHECK_MODULES(EMPATHY,
@@ -207,6 +185,7 @@ PKG_CHECK_MODULES(EMPATHY,
    gstreamer-0.10
    unique-1.0 >= $UNIQUE_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED
+   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
 ])
 
 PKG_CHECK_MODULES(LIBEMPATHY_ACCOUNTS_PANEL,
@@ -221,6 +200,7 @@ PKG_CHECK_MODULES(LIBEMPATHY_ACCOUNTS_PANEL,
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    unique-1.0 >= $UNIQUE_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED
+   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
 ])
 
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
@@ -584,9 +564,6 @@ Configure summary:
 	Favourite contacts .........:  ${have_favourite_contacts}
 	Control center embedding....:  ${have_control_center_embedding}
 
-    Logging:
-        Telepathy Logger............:  ${enable_tpl}
-
     Connectivity:
 	NetworkManager integration..:  ${have_nm}
 	ConnMan integration.........:  ${have_connman}
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index c8a4cbb..43763d5 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(LIBEMPATHYGTK_CFLAGS)				\
-	$(TPL_CFLAGS)					\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
@@ -132,7 +131,6 @@ nodist_libempathy_gtk_la_SOURCES =\
 libempathy_gtk_la_LIBADD =			\
 	$(LIBEMPATHYGTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
-	$(TPL_LIBS)				\
 	$(ENCHANT_LIBS)				\
 	$(LIBCHAMPLAIN_LIBS)			\
 	$(GEOCLUE_LIBS)				\
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ffb2c51..9e69c73 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -36,12 +36,7 @@
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
-#ifdef ENABLE_TPL
 #include <telepathy-logger/log-manager.h>
-#else
-
-#include <libempathy/empathy-log-manager.h>
-#endif /* ENABLE_TPL */
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
@@ -80,11 +75,7 @@ typedef struct {
 	GSettings         *gsettings_chat;
 	GSettings         *gsettings_ui;
 
-#ifdef ENABLE_TPL
 	TplLogManager     *log_manager;
-#else
-	EmpathyLogManager *log_manager;
-#endif /* ENABLE_TPL */
 	TpAccountManager  *account_manager;
 	GList             *input_history;
 	GList             *input_history_current;
@@ -1930,43 +1921,28 @@ chat_input_populate_popup_cb (GtkTextView *view,
 }
 
 
-#ifdef ENABLE_TPL
 static gboolean
 chat_log_filter (TplEntry *log,
 		 gpointer user_data)
-#else
-static gboolean
-chat_log_filter (EmpathyMessage *message,
-		 gpointer user_data)
-#endif /* ENABLE_TPL */
 {
 	EmpathyChat *chat = user_data;
-#ifdef ENABLE_TPL
 	EmpathyMessage *message;
-#endif /* ENABLE_TPL */
 	EmpathyChatPriv *priv = GET_PRIV (chat);
 	const GList *pending;
 
-#ifdef ENABLE_TPL
 	g_return_val_if_fail (TPL_IS_ENTRY (log), FALSE);
-#else
-	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-#endif /* ENABLE_TPL */
 	g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
 
 	pending = empathy_tp_chat_get_pending_messages (priv->tp_chat);
-#ifdef ENABLE_TPL
 	message = empathy_message_from_tpl_log_entry (log);
-#endif /* ENABLE_TPL */
 
 	for (; pending; pending = g_list_next (pending)) {
 		if (empathy_message_equal (message, pending->data)) {
 			return FALSE;
 		}
 	}
-#ifdef ENABLE_TPL
+
 	g_object_unref (message);
-#endif
 	return TRUE;
 }
 
@@ -1993,7 +1969,6 @@ show_pending_messages (EmpathyChat *chat) {
 }
 
 
-#ifdef ENABLE_TPL
 static void
 got_filtered_messages_cb (GObject *manager,
 		GAsyncResult *result,
@@ -2039,17 +2014,12 @@ out:
 	/* Turn back on scrolling */
 	empathy_chat_view_scroll (chat->view, TRUE);
 }
-#endif /* ENABLE_TPL */
-
 
 static void
 chat_add_logs (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
 	gboolean         is_chatroom;
-#ifndef ENABLE_TPL
-	GList           *messages, *l;
-#endif /* ENABLE_TPL */
 
 	if (!priv->id) {
 		return;
@@ -2061,25 +2031,6 @@ chat_add_logs (EmpathyChat *chat)
 	/* Add messages from last conversation */
 	is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM;
 
-#ifndef ENABLE_TPL
-	messages = empathy_log_manager_get_filtered_messages (priv->log_manager,
-							      priv->account,
-							      priv->id,
-							      is_chatroom,
-							      5,
-							      chat_log_filter,
-							      chat);
-
-	for (l = messages; l; l = g_list_next (l)) {
-		empathy_chat_view_append_message (chat->view, l->data);
-		g_object_unref (l->data);
-	}
-
-	g_list_free (messages);
-
-	/* Turn back on scrolling */
-	empathy_chat_view_scroll (chat->view, TRUE);
-#else
 	priv->retrieving_backlogs = TRUE;
 	tpl_log_manager_get_filtered_messages_async (priv->log_manager,
 							      priv->account,
@@ -2090,7 +2041,6 @@ chat_add_logs (EmpathyChat *chat)
 							      chat,
 							      got_filtered_messages_cb,
 							      (gpointer) chat);
-#endif /* ENABLE_TPL */
 }
 
 static gint
@@ -2724,12 +2674,6 @@ chat_constructed (GObject *object)
 
 	if (priv->handle_type != TP_HANDLE_TYPE_ROOM)
 		chat_add_logs (chat);
-#ifndef ENABLE_TPL
-	/* When async API are involved, pending message are shown at the end of the
-	 * callbacks' chain fired by chat_add_logs */
-	priv->can_show_pending = TRUE;
-	show_pending_messages (chat);
-#endif /* ENABLE_TPL */
 }
 
 static void
@@ -2872,11 +2816,7 @@ empathy_chat_init (EmpathyChat *chat)
 		EMPATHY_TYPE_CHAT, EmpathyChatPriv);
 
 	chat->priv = priv;
-#ifndef ENABLE_TPL
-	priv->log_manager = empathy_log_manager_dup_singleton ();
-#else
 	priv->log_manager = tpl_log_manager_dup_singleton ();
-#endif /* ENABLE_TPL */
 	priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
 	priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
 
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 9cc93b1..9ea19af 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -25,12 +25,8 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#ifdef ENABLE_TPL
 #include <telepathy-logger/log-manager.h>
-#else
 
-#include <libempathy/empathy-log-manager.h>
-#endif /* ENABLE_TPL */
 #include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-dispatcher.h>
@@ -322,30 +318,19 @@ contact_log_menu_item_activate_cb (EmpathyContact *contact)
 GtkWidget *
 empathy_contact_log_menu_item_new (EmpathyContact *contact)
 {
-#ifndef ENABLE_TPL
-	EmpathyLogManager *manager;
-#else
 	TplLogManager     *manager;
-#endif /* ENABLE_TPL */
 	gboolean           have_log;
 	GtkWidget         *item;
 	GtkWidget         *image;
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-#ifndef ENABLE_TPL
-	manager = empathy_log_manager_dup_singleton ();
-	have_log = empathy_log_manager_exists (manager,
-					       empathy_contact_get_account (contact),
-					       empathy_contact_get_id (contact),
-					       FALSE);
-#else
 	manager = tpl_log_manager_dup_singleton ();
 	have_log = tpl_log_manager_exists (manager,
 					       empathy_contact_get_account (contact),
 					       empathy_contact_get_id (contact),
 					       FALSE);
-#endif /* ENABLE_TPL */
+
 	g_object_unref (manager);
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations"));
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index c60ca64..04abd01 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -31,13 +31,8 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/account-manager.h>
-#ifdef ENABLE_TPL
 #include <telepathy-logger/log-manager.h>
-#endif /* ENABLE_TPL */
 
-#ifndef ENABLE_TPL
-#include <libempathy/empathy-log-manager.h>
-#endif /* ENABLE_TPL */
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-message.h>
@@ -76,11 +71,7 @@ typedef struct {
 
 	gchar             *last_find;
 
-#ifndef ENABLE_TPL
-	EmpathyLogManager *log_manager;
-#else
 	TplLogManager     *log_manager;
-#endif /* ENABLE_TPL */
 
 	/* Those are only used while waiting for the account chooser to be ready */
 	TpAccount         *selected_account;
@@ -215,11 +206,7 @@ empathy_log_window_show (TpAccount  *account,
 	}
 
 	window = g_new0 (EmpathyLogWindow, 1);
-#ifndef ENABLE_TPL
-	window->log_manager = empathy_log_manager_dup_singleton ();
-#else
 	window->log_manager = tpl_log_manager_dup_singleton ();
-#endif /* ENABLE_TPL */
 
 	filename = empathy_file_lookup ("empathy-log-window.ui",
 					"libempathy-gtk");
@@ -355,7 +342,6 @@ log_window_entry_find_changed_cb (GtkWidget       *entry,
 	gtk_widget_set_sensitive (window->button_find, is_sensitive);
 }
 
-#ifdef ENABLE_TPL
 static void
 got_messages_for_date_cb (GObject *manager,
                        GAsyncResult *result,
@@ -430,8 +416,6 @@ gdate_from_str (const gchar *str)
 	return g_date_new_dmy (day, month, year);
 }
 
-#endif /* ENABLE_TPL */
-
 static void
 log_window_find_changed_cb (GtkTreeSelection *selection,
 			    EmpathyLogWindow  *window)
@@ -443,15 +427,7 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	gchar         *chat_id;
 	gboolean       is_chatroom;
 	gchar         *date;
-#ifndef ENABLE_TPL
-	EmpathyMessage *message;
-	GList         *messages;
-	GList         *l;
-	gboolean       can_do_previous;
-	gboolean       can_do_next;
-#else
 	GDate         *gdate;
-#endif /* ENABLE_TPL */
 
 	/* Get selected information */
 	view = GTK_TREE_VIEW (window->treeview_find);
@@ -483,13 +459,6 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	empathy_chat_view_scroll (window->chatview_find, FALSE);
 
 	/* Get messages */
-#ifndef ENABLE_TPL
-	messages = empathy_log_manager_get_messages_for_date (window->log_manager,
-							      account,
-							      chat_id,
-							      is_chatroom,
-							      date);
-#else
 	gdate = gdate_from_str (date);
 
 	if (gdate != NULL) {
@@ -503,43 +472,13 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 
 		g_date_free (gdate);
 	}
-#endif /* ENABLE_TPL */
 
 	g_object_unref (account);
 	g_free (date);
 	g_free (chat_id);
-
-#ifndef ENABLE_TPL
-	for (l = messages; l; l = l->next) {
-		message = l->data;
-		empathy_chat_view_append_message (window->chatview_find, message);
-		g_object_unref (message);
-	}
-	g_list_free (messages);
-
-	/* Scroll to the most recent messages */
-	empathy_chat_view_scroll (window->chatview_find, TRUE);
-
-	/* Highlight and find messages */
-	empathy_chat_view_highlight (window->chatview_find,
-				    window->last_find, FALSE);
-	empathy_chat_view_find_next (window->chatview_find,
-				    window->last_find,
-				    TRUE,
-				    FALSE);
-	empathy_chat_view_find_abilities (window->chatview_find,
-					 window->last_find,
-					 FALSE,
-					 &can_do_previous,
-					 &can_do_next);
-	gtk_widget_set_sensitive (window->button_previous, can_do_previous);
-	gtk_widget_set_sensitive (window->button_next, can_do_next);
-	gtk_widget_set_sensitive (window->button_find, FALSE);
-#endif /* ENABLE_TPL */
 }
 
 
-#ifdef ENABLE_TPL
 static void
 log_manager_searched_new_cb (GObject *manager,
                              GAsyncResult *result,
@@ -603,24 +542,15 @@ log_manager_searched_new_cb (GObject *manager,
 			tpl_log_manager_search_free (hits);
 	}
 }
-#endif /* ENABLE_TPL */
-
 
 static void
 log_window_find_populate (EmpathyLogWindow *window,
 			  const gchar     *search_criteria)
 {
-#ifndef ENABLE_TPL
-	GList              *hits, *l;
-
-#endif /* ENABLE_TPL */
 	GtkTreeView        *view;
 	GtkTreeModel       *model;
 	GtkTreeSelection   *selection;
 	GtkListStore       *store;
-#ifndef ENABLE_TPL
-	GtkTreeIter         iter;
-#endif /* ENABLE_TPL */
 
 	view = GTK_TREE_VIEW (window->treeview_find);
 	model = gtk_tree_view_get_model (view);
@@ -636,53 +566,8 @@ log_window_find_populate (EmpathyLogWindow *window,
 		return;
 	}
 
-#ifdef ENABLE_TPL
 	tpl_log_manager_search_async (window->log_manager, search_criteria,
 			log_manager_searched_new_cb, (gpointer) store);
-#else
-	hits = empathy_log_manager_search_new (window->log_manager, search_criteria);
-
-	for (l = hits; l; l = l->next) {
-		EmpathyLogSearchHit *hit;
-		const gchar         *account_name;
-		const gchar         *account_icon;
-		gchar               *date_readable;
-
-		hit = l->data;
-
-		/* Protect against invalid data (corrupt or old log files. */
-		if (!hit->account || !hit->chat_id) {
-			continue;
-		}
-
-		date_readable = empathy_log_manager_get_date_readable (hit->date);
-		account_name = tp_account_get_display_name (hit->account);
-		account_icon = tp_account_get_icon_name (hit->account);
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
-				    COL_FIND_ACCOUNT_ICON, account_icon,
-				    COL_FIND_ACCOUNT_NAME, account_name,
-				    COL_FIND_ACCOUNT, hit->account,
-				    COL_FIND_CHAT_NAME, hit->chat_id, /* FIXME */
-				    COL_FIND_CHAT_ID, hit->chat_id,
-				    COL_FIND_IS_CHATROOM, hit->is_chatroom,
-				    COL_FIND_DATE, hit->date,
-				    COL_FIND_DATE_READABLE, date_readable,
-				    -1);
-
-		g_free (date_readable);
-
-		/* FIXME: Update COL_FIND_CHAT_NAME */
-		if (hit->is_chatroom) {
-		} else {
-		}
-	}
-
-	if (hits) {
-		empathy_log_manager_search_free (hits);
-	}
-#endif /* ENABLE_TPL */
 }
 
 static void
@@ -861,7 +746,6 @@ log_window_chats_changed_cb (GtkTreeSelection *selection,
 	log_window_chats_get_messages (window, NULL);
 }
 
-#ifdef ENABLE_TPL
 static void
 log_manager_got_chats_cb (GObject *manager,
                        GAsyncResult *result,
@@ -922,25 +806,17 @@ log_manager_got_chats_cb (GObject *manager,
 
 	g_object_unref (account);
 }
-#endif /* ENABLE_TPL */
-
 
 static void
 log_window_chats_populate (EmpathyLogWindow *window)
 {
 	EmpathyAccountChooser *account_chooser;
 	TpAccount             *account;
-#ifndef ENABLE_TPL
-	GList                *chats, *l;
-#endif /* ENABLE_TPL */
 
 	GtkTreeView          *view;
 	GtkTreeModel         *model;
 	GtkTreeSelection     *selection;
 	GtkListStore         *store;
-#ifndef ENABLE_TPL
-	GtkTreeIter           iter;
-#endif /* ENABLE_TPL */
 
 	account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);
 	account = empathy_account_chooser_dup_account (account_chooser);
@@ -962,40 +838,8 @@ log_window_chats_populate (EmpathyLogWindow *window)
 
 	gtk_list_store_clear (store);
 
-#ifdef ENABLE_TPL
 	tpl_log_manager_get_chats_async (window->log_manager, account,
 			log_manager_got_chats_cb, (gpointer) window);
-#else
-	chats = empathy_log_manager_get_chats (window->log_manager, account);
-	for (l = chats; l; l = l->next) {
-		EmpathyLogSearchHit *hit;
-
-		hit = l->data;
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
-				    COL_CHAT_ICON, "empathy-available", /* FIXME */
-				    COL_CHAT_NAME, hit->chat_id,
-				    COL_CHAT_ACCOUNT, account,
-				    COL_CHAT_ID, hit->chat_id,
-				    COL_CHAT_IS_CHATROOM, hit->is_chatroom,
-				    -1);
-
-		/* FIXME: Update COL_CHAT_ICON/NAME */
-		if (hit->is_chatroom) {
-		} else {
-		}
-	}
-	empathy_log_manager_search_free (chats);
-
-	/* Unblock signals */
-	g_signal_handlers_unblock_by_func (selection,
-					   log_window_chats_changed_cb,
-					   window);
-
-
-	g_object_unref (account);
-#endif /* ENABLE_TPL */
 }
 
 static void
@@ -1165,7 +1009,6 @@ log_window_chats_get_selected (EmpathyLogWindow  *window,
 	return TRUE;
 }
 
-#ifdef ENABLE_TPL
 static void
 log_window_got_messages_for_date_cb (GObject *manager,
     GAsyncResult *result,
@@ -1367,151 +1210,6 @@ log_window_chats_get_messages (EmpathyLogWindow *window,
 	g_free (chat_id);
 }
 
-#else
-
-static void
-log_window_chats_get_messages (EmpathyLogWindow *window,
-			       GDate     *date_to_show)
-{
-	TpAccount     *account;
-	gchar         *chat_id;
-	gboolean       is_chatroom;
-	EmpathyMessage *message;
-	GList         *messages;
-	GList         *dates = NULL;
-	GList         *l;
-	const gchar   *date = NULL;
-	guint          year_selected;
-	guint          year;
-	guint          month;
-	guint          month_selected;
-	guint          day;
-
-	if (!log_window_chats_get_selected (window, &account,
-					    &chat_id, &is_chatroom)) {
-		return;
-	}
-
-	g_signal_handlers_block_by_func (window->calendar_chats,
-					 log_window_calendar_chats_day_selected_cb,
-					 window);
-
-	/* Either use the supplied date or get the last */
-	if (date_to_show == NULL) {
-		gboolean day_selected = FALSE;
-
-		/* Get a list of dates and show them on the calendar */
-		dates = empathy_log_manager_get_dates (window->log_manager,
-						       account, chat_id,
-						       is_chatroom);
-
-		for (l = dates; l; l = l->next) {
-			const gchar *str;
-
-			str = l->data;
-			if (!str) {
-				continue;
-			}
-
-			sscanf (str, "%4d%2d%2d", &year, &month, &day);
-			gtk_calendar_get_date (GTK_CALENDAR (window->calendar_chats),
-					       &year_selected,
-					       &month_selected,
-					       NULL);
-
-			month_selected++;
-
-			if (!l->next) {
-				date = str;
-			}
-
-			if (year != year_selected || month != month_selected) {
-				continue;
-			}
-
-
-			DEBUG ("Marking date:'%s'", str);
-			gtk_calendar_mark_day (GTK_CALENDAR (window->calendar_chats), day);
-
-			if (l->next) {
-				continue;
-			}
-
-			day_selected = TRUE;
-
-			gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), day);
-		}
-
-		if (!day_selected) {
-			/* Unselect the day in the calendar */
-			gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), 0);
-		}
-	} else {
-		gchar buf[9];
-
-		day = g_date_get_day (date_to_show);
-		gtk_calendar_get_date (GTK_CALENDAR (window->calendar_chats),
-				       &year_selected,
-				       &month_selected,
-				       NULL);
-
-		month_selected++;
-
-		if (g_date_get_year (date_to_show) != year_selected &&
-			g_date_get_month (date_to_show) != month_selected) {
-			day = 0;
-		}
-
-		gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), day);
-
-		g_date_strftime (buf, 9, "%Y%m%d", date_to_show);
-		date = buf;
-	}
-
-	g_signal_handlers_unblock_by_func (window->calendar_chats,
-					   log_window_calendar_chats_day_selected_cb,
-					   window);
-
-	if (!date) {
-		goto OUT;
-	}
-
-	/* Clear all current messages shown in the textview */
-	empathy_chat_view_clear (window->chatview_chats);
-
-	/* Turn off scrolling temporarily */
-	empathy_chat_view_scroll (window->chatview_find, FALSE);
-
-	/* Get messages */
-	messages = empathy_log_manager_get_messages_for_date (window->log_manager,
-							      account, chat_id,
-							      is_chatroom,
-							      date);
-
-	for (l = messages; l; l = l->next) {
-		message = l->data;
-
-		empathy_chat_view_append_message (window->chatview_chats,
-						 message);
-		g_object_unref (message);
-	}
-	g_list_free (messages);
-
-	/* Turn back on scrolling */
-	empathy_chat_view_scroll (window->chatview_find, TRUE);
-
-	/* Give the search entry main focus */
-	gtk_widget_grab_focus (window->entry_chats);
-
-OUT:
-	g_list_foreach (dates, (GFunc) g_free, NULL);
-	g_list_free (dates);
-	g_object_unref (account);
-	g_free (chat_id);
-}
-
-#endif /* ENABLE_TPL */
-
 static void
 log_window_calendar_chats_day_selected_cb (GtkWidget       *calendar,
 					   EmpathyLogWindow *window)
@@ -1538,8 +1236,6 @@ log_window_calendar_chats_day_selected_cb (GtkWidget       *calendar,
 	g_date_free (date);
 }
 
-
-#ifdef ENABLE_TPL
 static void
 log_window_updating_calendar_month_cb (GObject *manager,
 		GAsyncResult *result, gpointer user_data)
@@ -1587,8 +1283,6 @@ log_window_updating_calendar_month_cb (GObject *manager,
 	DEBUG ("Currently showing month %d and year %d", month_selected,
 			year_selected);
 }
-#endif /* ENABLE_TPL */
-
 
 static void
 log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
@@ -1597,13 +1291,6 @@ log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 	TpAccount     *account;
 	gchar         *chat_id;
 	gboolean       is_chatroom;
-#ifndef ENABLE_TPL
-	guint          year_selected;
-	guint          month_selected;
-
-	GList         *dates;
-	GList         *l;
-#endif /* ENABLE_TPL */
 
 	gtk_calendar_clear_marks (GTK_CALENDAR (calendar));
 
@@ -1614,48 +1301,10 @@ log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 	}
 
 	/* Get the log object for this contact */
-#ifdef ENABLE_TPL
 	tpl_log_manager_get_dates_async (window->log_manager, account,
 					       chat_id, is_chatroom,
 					       log_window_updating_calendar_month_cb,
 					       (gpointer) window);
-#else
-	dates = empathy_log_manager_get_dates (window->log_manager, account,
-					       chat_id, is_chatroom);
-
-	g_object_get (calendar,
-		      "month", &month_selected,
-		      "year", &year_selected,
-		      NULL);
-
-	/* We need this here because it appears that the months start from 0 */
-	month_selected++;
-
-	for (l = dates; l; l = l->next) {
-		const gchar *str;
-		guint        year;
-		guint        month;
-		guint        day;
-
-		str = l->data;
-		if (!str) {
-			continue;
-		}
-
-		sscanf (str, "%4d%2d%2d", &year, &month, &day);
-
-		if (year == year_selected && month == month_selected) {
-			DEBUG ("Marking date:'%s'", str);
-			gtk_calendar_mark_day (GTK_CALENDAR (window->calendar_chats), day);
-		}
-	}
-
-	g_list_foreach (dates, (GFunc) g_free, NULL);
-	g_list_free (dates);
-
-	DEBUG ("Currently showing month %d and year %d", month_selected,
-		year_selected);
-#endif /* ENABLE_TPL */
 
 	g_object_unref (account);
 	g_free (chat_id);
@@ -1693,4 +1342,3 @@ log_window_entry_chats_activate_cb (GtkWidget       *entry,
 					    FALSE);
 	}
 }
-
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index c8d3629..d44d8af 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DLOCALEDIR=\""$(datadir)/locale"\"		\
 	-DG_LOG_DOMAIN=\"empathy\"			\
-	$(TPL_CFLAGS)					\
 	$(LIBEMPATHY_CFLAGS)				\
 	$(GEOCLUE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
@@ -61,14 +60,6 @@ libempathy_headers =				\
 	empathy-types.h				\
 	empathy-utils.h
 
-if !ENABLE_TPL
-libempathy_headers +=	\
-	empathy-log-manager.h				\
-	empathy-log-store-empathy.h			\
-	empathy-log-store.h				\
-	$(NULL)
-endif
-
 libempathy_la_SOURCES =					\
 	$(libempathy_headers)				\
 	empathy-account-settings.c			\
@@ -103,14 +94,6 @@ libempathy_la_SOURCES =					\
 	empathy-tp-roomlist.c				\
 	empathy-utils.c
 
-if !ENABLE_TPL
-libempathy_la_SOURCES += \
-	empathy-log-manager.c				\
-	empathy-log-store-empathy.c			\
-	empathy-log-store.c				\
-	$(NULL)
-endif
-
 # do not distribute generated files
 nodist_libempathy_la_SOURCES =\
 	$(BUILT_SOURCES)
@@ -119,7 +102,6 @@ libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
 	$(LIBEMPATHY_LIBS) \
 	$(GEOCLUE_LIBS) \
-	$(TPL_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
 	$(CONNMAN_LIBS)
 
@@ -192,11 +174,6 @@ dtd_DATA = 					\
 	empathy-chatroom-manager.dtd		\
 	empathy-irc-networks.dtd
 
-if !ENABLE_TPL
-stylesheetdir = $(datadir)/empathy
-stylesheet_DATA = empathy-log-manager.xsl
-endif
-
 ircnetworksdir = $(datadir)/empathy
 ircnetworks_DATA =		\
 	irc-networks.xml
@@ -206,10 +183,6 @@ EXTRA_DIST = 			\
 	$(dtd_DATA)		\
 	$(ircnetworks_DATA)
 
-if !ENABLE_TPL
-EXTRA_DIST +=  $(stylesheet_DATA)
-endif
-
 CLEANFILES = 				\
 	$(BUILT_SOURCES)		\
 	stamp-empathy-enum-types.h
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 7530730..cbd3bd0 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -28,9 +28,6 @@
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
-#ifdef ENABEL_TPL
-#include <telepathy-logger/contact.h>
-#endif /* ENABLE_TPL */
 
 #if HAVE_GEOCLUE
 #include <geoclue/geoclue-geocode.h>
@@ -479,7 +476,6 @@ empathy_contact_new (TpContact *tp_contact)
       NULL);
 }
 
-#ifdef ENABLE_TPL
 EmpathyContact *
 empathy_contact_from_tpl_contact (TpAccount *account,
     TplEntity *tpl_entity)
@@ -504,7 +500,6 @@ empathy_contact_from_tpl_contact (TpAccount *account,
 
   return retval;
 }
-#endif /* ENABLE_TPL */
 
 EmpathyContact *
 empathy_contact_new_for_log (TpAccount *account,
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 69c215a..ddb3f66 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -26,9 +26,7 @@
 
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/account.h>
-#ifdef ENABLE_TPL
 #include <telepathy-logger/entity.h>
-#endif /* ENABLE_TPL */
 
 G_BEGIN_DECLS
 
@@ -73,10 +71,8 @@ typedef enum {
 
 GType empathy_contact_get_type (void) G_GNUC_CONST;
 EmpathyContact * empathy_contact_new (TpContact *tp_contact);
-#ifdef ENABLE_TPL
 EmpathyContact * empathy_contact_from_tpl_contact (TpAccount *account,
     TplEntity *tpl_contact);
-#endif /* ENABLE_TPL */
 EmpathyContact * empathy_contact_new_for_log (TpAccount *account,
     const gchar *id, const gchar *name, gboolean is_user);
 TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact);
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
deleted file mode 100644
index 8478762..0000000
--- a/libempathy/empathy-log-manager.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib/gstdio.h>
-
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-
-#include "empathy-log-manager.h"
-#include "empathy-log-store-empathy.h"
-#include "empathy-log-store.h"
-#include "empathy-tp-chat.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLogManager)
-typedef struct
-{
-  GList *stores;
-} EmpathyLogManagerPriv;
-
-G_DEFINE_TYPE (EmpathyLogManager, empathy_log_manager, G_TYPE_OBJECT);
-
-static EmpathyLogManager * manager_singleton = NULL;
-
-static void
-log_manager_finalize (GObject *object)
-{
-  EmpathyLogManagerPriv *priv;
-
-  priv = GET_PRIV (object);
-
-  g_list_foreach (priv->stores, (GFunc) g_object_unref, NULL);
-  g_list_free (priv->stores);
-}
-
-static GObject *
-log_manager_constructor (GType type,
-                         guint n_props,
-                         GObjectConstructParam *props)
-{
-  GObject *retval;
-  EmpathyLogManagerPriv *priv;
-
-  if (manager_singleton)
-    {
-      retval = g_object_ref (manager_singleton);
-    }
-  else
-    {
-      retval = G_OBJECT_CLASS (empathy_log_manager_parent_class)->constructor
-          (type, n_props, props);
-
-      manager_singleton = EMPATHY_LOG_MANAGER (retval);
-      g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
-
-      priv = GET_PRIV (manager_singleton);
-
-      priv->stores = g_list_append (priv->stores,
-          g_object_new (EMPATHY_TYPE_LOG_STORE_EMPATHY, NULL));
-    }
-
-  return retval;
-}
-
-static void
-empathy_log_manager_class_init (EmpathyLogManagerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructor = log_manager_constructor;
-  object_class->finalize = log_manager_finalize;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyLogManagerPriv));
-}
-
-static void
-empathy_log_manager_init (EmpathyLogManager *manager)
-{
-  EmpathyLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-      EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv);
-
-  manager->priv = priv;
-}
-
-EmpathyLogManager *
-empathy_log_manager_dup_singleton (void)
-{
-  return g_object_new (EMPATHY_TYPE_LOG_MANAGER, NULL);
-}
-
-gboolean
-empathy_log_manager_add_message (EmpathyLogManager *manager,
-                                 const gchar *chat_id,
-                                 gboolean chatroom,
-                                 EmpathyMessage *message,
-                                 GError **error)
-{
-  EmpathyLogManagerPriv *priv;
-  GList *l;
-  gboolean out = FALSE;
-  gboolean found = FALSE;
-
-  /* TODO: When multiple log stores appear with add_message implementations
-   * make this customisable. */
-  const gchar *add_store = "Empathy";
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE);
-  g_return_val_if_fail (chat_id != NULL, FALSE);
-  g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      if (!tp_strdiff (empathy_log_store_get_name (
-              EMPATHY_LOG_STORE (l->data)), add_store))
-        {
-          out = empathy_log_store_add_message (EMPATHY_LOG_STORE (l->data),
-              chat_id, chatroom, message, error);
-          found = TRUE;
-          break;
-        }
-    }
-
-  if (!found)
-    DEBUG ("Failed to find chosen log store to write to.");
-
-  return out;
-}
-
-gboolean
-empathy_log_manager_exists (EmpathyLogManager *manager,
-                            TpAccount *account,
-                            const gchar *chat_id,
-                            gboolean chatroom)
-{
-  GList *l;
-  EmpathyLogManagerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE);
-  g_return_val_if_fail (chat_id != NULL, FALSE);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      if (empathy_log_store_exists (EMPATHY_LOG_STORE (l->data),
-            account, chat_id, chatroom))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-GList *
-empathy_log_manager_get_dates (EmpathyLogManager *manager,
-                               TpAccount *account,
-                               const gchar *chat_id,
-                               gboolean chatroom)
-{
-  GList *l, *out = NULL;
-  EmpathyLogManagerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (chat_id != NULL, NULL);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
-      GList *new;
-
-      /* Insert dates of each store in the out list. Keep the out list sorted
-       * and avoid to insert dups. */
-      new = empathy_log_store_get_dates (store, account, chat_id, chatroom);
-      while (new)
-        {
-          if (g_list_find_custom (out, new->data, (GCompareFunc) strcmp))
-            g_free (new->data);
-          else
-            out = g_list_insert_sorted (out, new->data, (GCompareFunc) strcmp);
-
-          new = g_list_delete_link (new, new);
-        }
-    }
-
-  return out;
-}
-
-GList *
-empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
-                                           TpAccount *account,
-                                           const gchar *chat_id,
-                                           gboolean chatroom,
-                                           const gchar *date)
-{
-  GList *l, *out = NULL;
-  EmpathyLogManagerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (chat_id != NULL, NULL);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
-
-      out = g_list_concat (out, empathy_log_store_get_messages_for_date (
-          store, account, chat_id, chatroom, date));
-    }
-
-  return out;
-}
-
-static gint
-log_manager_message_date_cmp (gconstpointer a,
-			      gconstpointer b)
-{
-	EmpathyMessage *one = (EmpathyMessage *) a;
-	EmpathyMessage *two = (EmpathyMessage *) b;
-	time_t one_time, two_time;
-
-	one_time = empathy_message_get_timestamp (one);
-	two_time = empathy_message_get_timestamp (two);
-
-        /* Return -1 of message1 is older than message2 */
-	return one_time < two_time ? -1 : one_time - two_time;
-}
-
-GList *
-empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
-					   TpAccount *account,
-					   const gchar *chat_id,
-					   gboolean chatroom,
-					   guint num_messages,
-					   EmpathyLogMessageFilter filter,
-					   gpointer user_data)
-{
-  EmpathyLogManagerPriv *priv;
-  GList *out = NULL;
-  GList *l;
-  guint i = 0;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (chat_id != NULL, NULL);
-
-  priv = GET_PRIV (manager);
-
-  /* Get num_messages from each log store and keep only the
-   * newest ones in the out list. Keep that list sorted: Older first. */
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
-      GList *new;
-
-      new = empathy_log_store_get_filtered_messages (store, account, chat_id,
-          chatroom, num_messages, filter, user_data);
-      while (new)
-        {
-          if (i < num_messages)
-            {
-              /* We have less message than needed so far. Keep this message */
-              out = g_list_insert_sorted (out, new->data,
-                  (GCompareFunc) log_manager_message_date_cmp);
-              i++;
-            }
-          else if (log_manager_message_date_cmp (new->data, out->data) > 0)
-            {
-              /* This message is newer than the oldest message we have in out
-               * list. Remove the head of out list and insert this message */
-              g_object_unref (out->data);
-              out = g_list_delete_link (out, out);
-              out = g_list_insert_sorted (out, new->data,
-                  (GCompareFunc) log_manager_message_date_cmp);
-            }
-          else
-            {
-              /* This message is older than the oldest message we have in out
-               * list. Drop it. */
-              g_object_unref (new->data);
-            }
-
-          new = g_list_delete_link (new, new);
-        }
-    }
-
-  return out;
-}
-
-GList *
-empathy_log_manager_get_chats (EmpathyLogManager *manager,
-                               TpAccount *account)
-{
-  GList *l, *out = NULL;
-  EmpathyLogManagerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
-
-      out = g_list_concat (out,
-          empathy_log_store_get_chats (store, account));
-    }
-
-  return out;
-}
-
-GList *
-empathy_log_manager_search_new (EmpathyLogManager *manager,
-                                const gchar *text)
-{
-  GList *l, *out = NULL;
-  EmpathyLogManagerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (!EMP_STR_EMPTY (text), NULL);
-
-  priv = GET_PRIV (manager);
-
-  for (l = priv->stores; l; l = g_list_next (l))
-    {
-      EmpathyLogStore *store = EMPATHY_LOG_STORE (l->data);
-
-      out = g_list_concat (out,
-          empathy_log_store_search_new (store, text));
-    }
-
-  return out;
-}
-
-void
-empathy_log_manager_search_hit_free (EmpathyLogSearchHit *hit)
-{
-  if (hit->account != NULL)
-    g_object_unref (hit->account);
-
-  g_free (hit->date);
-  g_free (hit->filename);
-  g_free (hit->chat_id);
-
-  g_slice_free (EmpathyLogSearchHit, hit);
-}
-
-void
-empathy_log_manager_search_free (GList *hits)
-{
-  GList *l;
-
-  for (l = hits; l; l = g_list_next (l))
-    {
-      empathy_log_manager_search_hit_free (l->data);
-    }
-
-  g_list_free (hits);
-}
-
-/* Format is just date, 20061201. */
-gchar *
-empathy_log_manager_get_date_readable (const gchar *date)
-{
-  time_t t;
-
-  t = empathy_time_parse (date);
-
-  return empathy_time_to_string_local (t, "%a %d %b %Y");
-}
-
-static void
-log_manager_chat_received_message_cb (EmpathyTpChat *tp_chat,
-                                      EmpathyMessage *message,
-                                      EmpathyLogManager *log_manager)
-{
-  GError *error = NULL;
-  TpHandleType handle_type;
-  TpChannel *channel;
-
-  channel = empathy_tp_chat_get_channel (tp_chat);
-  tp_channel_get_handle (channel, &handle_type);
-
-  if (!empathy_log_manager_add_message (log_manager,
-        tp_channel_get_identifier (channel),
-        handle_type == TP_HANDLE_TYPE_ROOM,
-        message, &error))
-    {
-      DEBUG ("Failed to write message: %s",
-          error ? error->message : "No error message");
-
-      if (error != NULL)
-        g_error_free (error);
-    }
-}
-
-static void
-log_manager_dispatcher_observe_cb (EmpathyDispatcher *dispatcher,
-                                   EmpathyDispatchOperation *operation,
-                                   EmpathyLogManager *log_manager)
-{
-  GQuark channel_type;
-
-  channel_type = empathy_dispatch_operation_get_channel_type_id (operation);
-
-  if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
-    {
-      EmpathyTpChat *tp_chat;
-
-      tp_chat = EMPATHY_TP_CHAT (
-          empathy_dispatch_operation_get_channel_wrapper (operation));
-
-      g_signal_connect (tp_chat, "message-received",
-          G_CALLBACK (log_manager_chat_received_message_cb), log_manager);
-    }
-}
-
-
-void
-empathy_log_manager_observe (EmpathyLogManager *log_manager,
-                             EmpathyDispatcher *dispatcher)
-{
-  g_signal_connect (dispatcher, "observe",
-      G_CALLBACK (log_manager_dispatcher_observe_cb), log_manager);
-}
diff --git a/libempathy/empathy-log-manager.h b/libempathy/empathy-log-manager.h
deleted file mode 100644
index 1dcc7f2..0000000
--- a/libempathy/empathy-log-manager.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_LOG_MANAGER_H__
-#define __EMPATHY_LOG_MANAGER_H__
-
-#include <config.h>
-#ifndef ENABLE_TPL
-
-#include <glib-object.h>
-
-#include "empathy-message.h"
-#include "empathy-dispatcher.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_LOG_MANAGER (empathy_log_manager_get_type ())
-#define EMPATHY_LOG_MANAGER(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_LOG_MANAGER, \
-                               EmpathyLogManager))
-#define EMPATHY_LOG_MANAGER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_LOG_MANAGER, \
-                            EmpathyLogManagerClass))
-#define EMPATHY_IS_LOG_MANAGER(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_LOG_MANAGER))
-#define EMPATHY_IS_LOG_MANAGER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_LOG_MANAGER))
-#define EMPATHY_LOG_MANAGER_GET_CLASS(o) \
-  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_LOG_MANAGER, \
-                              EmpathyLogManagerClass))
-
-typedef struct _EmpathyLogManager EmpathyLogManager;
-typedef struct _EmpathyLogManagerClass EmpathyLogManagerClass;
-typedef struct _EmpathyLogSearchHit EmpathyLogSearchHit;
-
-struct _EmpathyLogManager
-{
-  GObject parent;
-  gpointer priv;
-};
-
-struct _EmpathyLogManagerClass
-{
-  GObjectClass parent_class;
-};
-
-struct _EmpathyLogSearchHit
-{
-  TpAccount *account;
-  gchar     *chat_id;
-  gboolean   is_chatroom;
-  gchar     *filename;
-  gchar     *date;
-};
-
-typedef gboolean (*EmpathyLogMessageFilter) (EmpathyMessage *message,
-    gpointer user_data);
-
-GType empathy_log_manager_get_type (void) G_GNUC_CONST;
-EmpathyLogManager *empathy_log_manager_dup_singleton (void);
-gboolean empathy_log_manager_add_message (EmpathyLogManager *manager,
-    const gchar *chat_id, gboolean chatroom, EmpathyMessage *message,
-    GError **error);
-gboolean empathy_log_manager_exists (EmpathyLogManager *manager,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom);
-GList *empathy_log_manager_get_dates (EmpathyLogManager *manager,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom);
-GList *empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom,
-    const gchar *date);
-GList *empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom,
-    guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data);
-GList *empathy_log_manager_get_chats (EmpathyLogManager *manager,
-    TpAccount *account);
-GList *empathy_log_manager_search_new (EmpathyLogManager *manager,
-    const gchar *text);
-void empathy_log_manager_search_free (GList *hits);
-gchar *empathy_log_manager_get_date_readable (const gchar *date);
-void empathy_log_manager_search_hit_free (EmpathyLogSearchHit *hit);
-void empathy_log_manager_observe (EmpathyLogManager *log_manager,
-    EmpathyDispatcher *dispatcher);
-
-G_END_DECLS
-
-#endif /* ENABLE_TPL */
-#endif /* __EMPATHY_LOG_MANAGER_H__ */
diff --git a/libempathy/empathy-log-manager.xsl b/libempathy/empathy-log-manager.xsl
deleted file mode 100644
index a934f3a..0000000
--- a/libempathy/empathy-log-manager.xsl
+++ /dev/null
@@ -1,148 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
-
-  <xsl:output method="html" encoding="utf-8" indent="yes"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-        <style type="text/css">
-          <xsl:text>
-            body {
-              background: #fff;
-	      font-family: Verdana, "Bitstream Vera Sans", Sans-Serif; 
-	      font-size: 10pt;
-            }
-            .stamp {
-              color: #999;
-            }
-            .top-day-stamp {
-              color: #999;
-              text-align: center;
-              margin-bottom: 1em;
-            }
-            .new-day-stamp {
-              color: #999;
-              text-align: center;
-              margin-bottom: 1em;
-              margin-top: 1em;
-            }
-            .nick {
-              color: rgb(54,100, 139);
-            }
-            .nick-self {
-              color: rgb(46,139,87);
-            }
-           .nick-highlight {
-              color: rgb(205,92,92);
-            }
-          </xsl:text>
-        </style>
-        <title><xsl:value-of select="$title"/></title>
-      </head>
-      <body>
-        <xsl:apply-templates/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="get-day">
-    <xsl:param name="stamp"/>
-    <xsl:value-of select="substring ($stamp, 1, 8)"/>
-  </xsl:template>
-
-  <xsl:template name="format-stamp">
-    <xsl:param name="stamp"/>
-    <xsl:variable name="hour" select="substring ($stamp, 10, 2)"/>
-    <xsl:variable name="min" select="substring ($stamp, 13, 2)"/>
-
-    <xsl:value-of select="$hour"/>:<xsl:value-of select="$min"/>
-  </xsl:template>
-
-  <xsl:template name="format-day-stamp">
-    <xsl:param name="stamp"/>
-    <xsl:variable name="year" select="substring ($stamp, 1, 4)"/>
-    <xsl:variable name="month" select="substring ($stamp, 5, 2)"/>
-    <xsl:variable name="day" select="substring ($stamp, 7, 2)"/>
-
-    <xsl:value-of select="$year"/>-<xsl:value-of select="$month"/>-<xsl:value-of select="$day"/>
-  </xsl:template>
-
-  <xsl:template name="header">
-    <xsl:param name="stamp"/>
-    <div class="top-day-stamp">
-      <xsl:call-template name="format-day-stamp">
-        <xsl:with-param name="stamp" select="@time"/>
-      </xsl:call-template>
-    </div>
-  </xsl:template>  
-
-  <xsl:template match="a">
-    <xsl:text disable-output-escaping="yes">&lt;a href="</xsl:text>
-
-    <xsl:value-of disable-output-escaping="yes" select="@href"/>
-
-    <xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
-
-    <xsl:value-of select="@href"/>
-    <xsl:text disable-output-escaping="yes">&lt;/a&gt;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="log">
-
-    <div class="top-day-stamp">
-      <xsl:call-template name="format-day-stamp">
-        <xsl:with-param name="stamp" select="//message[1]/@time"/>
-      </xsl:call-template>
-    </div>
-
-    <xsl:for-each select="*">
-
-      <xsl:variable name="prev-time">
-        <xsl:call-template name="get-day">
-          <xsl:with-param name="stamp" select="preceding-sibling::*[1]/@time"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="this-time">
-        <xsl:call-template name="get-day">
-          <xsl:with-param name="stamp" select="@time"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="$prev-time &lt; $this-time">
-        <div class="new-day-stamp">
-        <xsl:call-template name="format-day-stamp">
-          <xsl:with-param name="stamp" select="@time"/>
-        </xsl:call-template>
-        </div>
-      </xsl:if>
-
-      <xsl:variable name="stamp">
-        <xsl:call-template name="format-stamp">
-          <xsl:with-param name="stamp" select="@time"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <span class="stamp">
-       <xsl:value-of select="$stamp"/>
-      </span>
-
-      <xsl:variable name="nick-class">
-        <xsl:choose>
-          <xsl:when test="not(string(@id))">nick-self</xsl:when>
-          <xsl:otherwise>nick</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <span class="{$nick-class}">
-        &lt;<xsl:value-of select="@name"/>&gt;
-      </span>
- 
-      <xsl:apply-templates/>
-      <br/>
-
-    </xsl:for-each>
-
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
deleted file mode 100644
index 1291141..0000000
--- a/libempathy/empathy-log-store-empathy.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Jonny Lamb <jonny.lamb@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib/gstdio.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/defs.h>
-
-#include "empathy-log-store.h"
-#include "empathy-log-store-empathy.h"
-#include "empathy-log-manager.h"
-#include "empathy-contact.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-
-#define LOG_DIR_CREATE_MODE       (S_IRUSR | S_IWUSR | S_IXUSR)
-#define LOG_FILE_CREATE_MODE      (S_IRUSR | S_IWUSR)
-#define LOG_DIR_CHATROOMS         "chatrooms"
-#define LOG_FILENAME_SUFFIX       ".log"
-#define LOG_TIME_FORMAT_FULL      "%Y%m%dT%H:%M:%S"
-#define LOG_TIME_FORMAT           "%Y%m%d"
-#define LOG_HEADER \
-    "<?xml version='1.0' encoding='utf-8'?>\n" \
-    "<?xml-stylesheet type=\"text/xsl\" href=\"empathy-log.xsl\"?>\n" \
-    "<log>\n"
-
-#define LOG_FOOTER \
-    "</log>\n"
-
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLogStoreEmpathy)
-typedef struct
-{
-  gchar *basedir;
-  gchar *name;
-  TpAccountManager *account_manager;
-} EmpathyLogStoreEmpathyPriv;
-
-static void log_store_iface_init (gpointer g_iface,gpointer iface_data);
-
-G_DEFINE_TYPE_WITH_CODE (EmpathyLogStoreEmpathy, empathy_log_store_empathy,
-    G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_LOG_STORE,
-      log_store_iface_init));
-
-static void
-log_store_empathy_finalize (GObject *object)
-{
-  EmpathyLogStoreEmpathy *self = EMPATHY_LOG_STORE_EMPATHY (object);
-  EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self);
-
-  g_object_unref (priv->account_manager);
-  g_free (priv->basedir);
-  g_free (priv->name);
-}
-
-static void
-empathy_log_store_empathy_class_init (EmpathyLogStoreEmpathyClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = log_store_empathy_finalize;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyLogStoreEmpathyPriv));
-}
-
-static void
-empathy_log_store_empathy_init (EmpathyLogStoreEmpathy *self)
-{
-  EmpathyLogStoreEmpathyPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_LOG_STORE_EMPATHY, EmpathyLogStoreEmpathyPriv);
-
-  self->priv = priv;
-
-  priv->basedir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
-    PACKAGE_NAME, "logs", NULL);
-
-  priv->name = g_strdup ("Empathy");
-  priv->account_manager = tp_account_manager_dup ();
-}
-
-static gchar *
-log_store_account_to_dirname (TpAccount *account)
-{
-  const gchar *name;
-
-  name = tp_proxy_get_object_path (account);
-  if (g_str_has_prefix (name, TP_ACCOUNT_OBJECT_PATH_BASE))
-    name += strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  return g_strdelimit (g_strdup (name), "/", '_');
-}
-
-
-static gchar *
-log_store_empathy_get_dir (EmpathyLogStore *self,
-                           TpAccount *account,
-                           const gchar *chat_id,
-                           gboolean chatroom)
-{
-  gchar *basedir;
-  gchar *escaped;
-  EmpathyLogStoreEmpathyPriv *priv;
-
-  priv = GET_PRIV (self);
-
-  escaped = log_store_account_to_dirname (account);
-
-  if (chatroom)
-    basedir = g_build_path (G_DIR_SEPARATOR_S, priv->basedir, escaped,
-        LOG_DIR_CHATROOMS, chat_id, NULL);
-  else
-    basedir = g_build_path (G_DIR_SEPARATOR_S, priv->basedir,
-        escaped, chat_id, NULL);
-
-  g_free (escaped);
-
-  return basedir;
-}
-
-static gchar *
-log_store_empathy_get_timestamp_filename (void)
-{
-  time_t t;
-  gchar *time_str;
-  gchar *filename;
-
-  t = empathy_time_get_current ();
-  time_str = empathy_time_to_string_local (t, LOG_TIME_FORMAT);
-  filename = g_strconcat (time_str, LOG_FILENAME_SUFFIX, NULL);
-
-  g_free (time_str);
-
-  return filename;
-}
-
-static gchar *
-log_store_empathy_get_timestamp_from_message (EmpathyMessage *message)
-{
-  time_t t;
-
-  t = empathy_message_get_timestamp (message);
-
-  /* We keep the timestamps in the messages as UTC. */
-  return empathy_time_to_string_utc (t, LOG_TIME_FORMAT_FULL);
-}
-
-static gchar *
-log_store_empathy_get_filename (EmpathyLogStore *self,
-                                TpAccount *account,
-                                const gchar *chat_id,
-                                gboolean chatroom)
-{
-  gchar *basedir;
-  gchar *timestamp;
-  gchar *filename;
-
-  basedir = log_store_empathy_get_dir (self, account, chat_id, chatroom);
-  timestamp = log_store_empathy_get_timestamp_filename ();
-  filename = g_build_filename (basedir, timestamp, NULL);
-
-  g_free (basedir);
-  g_free (timestamp);
-
-  return filename;
-}
-
-static gboolean
-log_store_empathy_add_message (EmpathyLogStore *self,
-                               const gchar *chat_id,
-                               gboolean chatroom,
-                               EmpathyMessage *message,
-                               GError **error)
-{
-  FILE *file;
-  TpAccount *account;
-  EmpathyContact *sender;
-  const gchar *body_str;
-  const gchar *str;
-  EmpathyAvatar *avatar;
-  gchar *avatar_token = NULL;
-  gchar *filename;
-  gchar *basedir;
-  gchar *body;
-  gchar *timestamp;
-  gchar *contact_name;
-  gchar *contact_id;
-  TpChannelTextMessageType msg_type;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), FALSE);
-  g_return_val_if_fail (chat_id != NULL, FALSE);
-  g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
-  sender = empathy_message_get_sender (message);
-  account = empathy_contact_get_account (sender);
-  body_str = empathy_message_get_body (message);
-  msg_type = empathy_message_get_tptype (message);
-
-  if (EMP_STR_EMPTY (body_str))
-    return FALSE;
-
-  filename = log_store_empathy_get_filename (self, account, chat_id, chatroom);
-  basedir = g_path_get_dirname (filename);
-  if (!g_file_test (basedir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
-    {
-      DEBUG ("Creating directory:'%s'", basedir);
-      g_mkdir_with_parents (basedir, LOG_DIR_CREATE_MODE);
-    }
-  g_free (basedir);
-
-  DEBUG ("Adding message: '%s' to file: '%s'", body_str, filename);
-
-  if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-    {
-      file = g_fopen (filename, "w+");
-      if (file != NULL)
-        g_fprintf (file, LOG_HEADER);
-
-      g_chmod (filename, LOG_FILE_CREATE_MODE);
-    }
-  else
-    {
-      file = g_fopen (filename, "r+");
-      if (file != NULL)
-        fseek (file, - strlen (LOG_FOOTER), SEEK_END);
-    }
-
-  body = g_markup_escape_text (body_str, -1);
-  timestamp = log_store_empathy_get_timestamp_from_message (message);
-
-  str = empathy_contact_get_name (sender);
-  contact_name = g_markup_escape_text (str, -1);
-
-  str = empathy_contact_get_id (sender);
-  contact_id = g_markup_escape_text (str, -1);
-
-  avatar = empathy_contact_get_avatar (sender);
-  if (avatar != NULL)
-    avatar_token = g_markup_escape_text (avatar->token, -1);
-
-  g_fprintf (file,
-       "<message time='%s' cm_id='%d' id='%s' name='%s' token='%s' isuser='%s' type='%s'>"
-       "%s</message>\n" LOG_FOOTER, timestamp,
-       empathy_message_get_id (message),
-       contact_id, contact_name,
-       avatar_token ? avatar_token : "",
-       empathy_contact_is_user (sender) ? "true" : "false",
-       empathy_message_type_to_str (msg_type), body);
-
-  fclose (file);
-  g_free (filename);
-  g_free (contact_id);
-  g_free (contact_name);
-  g_free (timestamp);
-  g_free (body);
-  g_free (avatar_token);
-
-  return TRUE;
-}
-
-static gboolean
-log_store_empathy_exists (EmpathyLogStore *self,
-                          TpAccount *account,
-                          const gchar *chat_id,
-                          gboolean chatroom)
-{
-  gchar *dir;
-  gboolean exists;
-
-  dir = log_store_empathy_get_dir (self, account, chat_id, chatroom);
-  exists = g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
-  g_free (dir);
-
-  return exists;
-}
-
-static GList *
-log_store_empathy_get_dates (EmpathyLogStore *self,
-                             TpAccount *account,
-                             const gchar *chat_id,
-                             gboolean chatroom)
-{
-  GList *dates = NULL;
-  gchar *date;
-  gchar *directory;
-  GDir *dir;
-  const gchar *filename;
-  const gchar *p;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
-  g_return_val_if_fail (chat_id != NULL, NULL);
-
-  directory = log_store_empathy_get_dir (self, account, chat_id, chatroom);
-  dir = g_dir_open (directory, 0, NULL);
-  if (!dir)
-    {
-      DEBUG ("Could not open directory:'%s'", directory);
-      g_free (directory);
-      return NULL;
-    }
-
-  DEBUG ("Collating a list of dates in:'%s'", directory);
-
-  while ((filename = g_dir_read_name (dir)) != NULL)
-    {
-      if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX))
-        continue;
-
-      p = strstr (filename, LOG_FILENAME_SUFFIX);
-      date = g_strndup (filename, p - filename);
-
-      if (!date)
-        continue;
-
-      if (!g_regex_match_simple ("\\d{8}", date, 0, 0))
-        continue;
-
-      dates = g_list_insert_sorted (dates, date, (GCompareFunc) strcmp);
-    }
-
-  g_free (directory);
-  g_dir_close (dir);
-
-  DEBUG ("Parsed %d dates", g_list_length (dates));
-
-  return dates;
-}
-
-static gchar *
-log_store_empathy_get_filename_for_date (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *chat_id,
-                                         gboolean chatroom,
-                                         const gchar *date)
-{
-  gchar *basedir;
-  gchar *timestamp;
-  gchar *filename;
-
-  basedir = log_store_empathy_get_dir (self, account, chat_id, chatroom);
-  timestamp = g_strconcat (date, LOG_FILENAME_SUFFIX, NULL);
-  filename = g_build_filename (basedir, timestamp, NULL);
-
-  g_free (basedir);
-  g_free (timestamp);
-
-  return filename;
-}
-
-static EmpathyLogSearchHit *
-log_store_empathy_search_hit_new (EmpathyLogStore *self,
-                                  const gchar *filename)
-{
-  EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self);
-  EmpathyLogSearchHit *hit;
-  gchar *account_name;
-  const gchar *end;
-  gchar **strv;
-  guint len;
-  GList *accounts, *l;
-
-  if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX))
-    return NULL;
-
-  strv = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
-  len = g_strv_length (strv);
-
-  hit = g_slice_new0 (EmpathyLogSearchHit);
-
-  end = strstr (strv[len-1], LOG_FILENAME_SUFFIX);
-  hit->date = g_strndup (strv[len-1], end - strv[len-1]);
-  hit->chat_id = g_strdup (strv[len-2]);
-  hit->is_chatroom = (strcmp (strv[len-3], LOG_DIR_CHATROOMS) == 0);
-
-  if (hit->is_chatroom)
-    account_name = strv[len-4];
-  else
-    account_name = strv[len-3];
-
-  /* FIXME: This assumes the account manager is prepared, but the
-   * synchronous API forces this. See bug #599189. */
-  accounts = tp_account_manager_get_valid_accounts (priv->account_manager);
-
-  for (l = accounts; l != NULL; l = g_list_next (l))
-    {
-      TpAccount *account = TP_ACCOUNT (l->data);
-      gchar *name;
-
-      name = log_store_account_to_dirname (account);
-      if (!tp_strdiff (name, account_name))
-        {
-          g_assert (hit->account == NULL);
-          hit->account = account;
-          g_object_ref (account);
-        }
-      g_free (name);
-    }
-  g_list_free (accounts);
-
-  hit->filename = g_strdup (filename);
-
-  g_strfreev (strv);
-
-  return hit;
-}
-
-static GList *
-log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *filename)
-{
-  GList *messages = NULL;
-  xmlParserCtxtPtr ctxt;
-  xmlDocPtr doc;
-  xmlNodePtr log_node;
-  xmlNodePtr node;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
-  g_return_val_if_fail (filename != NULL, NULL);
-
-  DEBUG ("Attempting to parse filename:'%s'...", filename);
-
-  if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-    {
-      DEBUG ("Filename:'%s' does not exist", filename);
-      return NULL;
-    }
-
-  /* Create parser. */
-  ctxt = xmlNewParserCtxt ();
-
-  /* Parse and validate the file. */
-  doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
-  if (!doc)
-    {
-      g_warning ("Failed to parse file:'%s'", filename);
-      xmlFreeParserCtxt (ctxt);
-      return NULL;
-    }
-
-  /* The root node, presets. */
-  log_node = xmlDocGetRootElement (doc);
-  if (!log_node)
-    {
-      xmlFreeDoc (doc);
-      xmlFreeParserCtxt (ctxt);
-      return NULL;
-    }
-
-  /* Now get the messages. */
-  for (node = log_node->children; node; node = node->next)
-    {
-      EmpathyMessage *message;
-      EmpathyContact *sender;
-      gchar *time_;
-      time_t t;
-      gchar *sender_id;
-      gchar *sender_name;
-      gchar *sender_avatar_token;
-      gchar *body;
-      gchar *is_user_str;
-      gboolean is_user = FALSE;
-      gchar *msg_type_str;
-      gchar *cm_id_str;
-      guint cm_id;
-      TpChannelTextMessageType msg_type = TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL;
-
-      if (strcmp ((const gchar *) node->name, "message") != 0)
-        continue;
-
-      body = (gchar *) xmlNodeGetContent (node);
-      time_ = (gchar *) xmlGetProp (node, (const xmlChar *) "time");
-      sender_id = (gchar *) xmlGetProp (node, (const xmlChar *) "id");
-      sender_name = (gchar *) xmlGetProp (node, (const xmlChar *) "name");
-      sender_avatar_token = (gchar *) xmlGetProp (node,
-          (const xmlChar *) "token");
-      is_user_str = (gchar *) xmlGetProp (node, (const xmlChar *) "isuser");
-      msg_type_str = (gchar *) xmlGetProp (node, (const xmlChar *) "type");
-      cm_id_str = (gchar *) xmlGetProp (node, (const xmlChar *) "cm_id");
-
-      if (is_user_str)
-        is_user = strcmp (is_user_str, "true") == 0;
-
-      if (msg_type_str)
-        msg_type = empathy_message_type_from_str (msg_type_str);
-
-      if (cm_id_str)
-        cm_id = atoi (cm_id_str);
-
-      t = empathy_time_parse (time_);
-
-      sender = empathy_contact_new_for_log (account, sender_id, sender_name,
-					    is_user);
-
-      if (!EMP_STR_EMPTY (sender_avatar_token))
-        empathy_contact_load_avatar_cache (sender,
-            sender_avatar_token);
-
-      message = empathy_message_new (body);
-      empathy_message_set_sender (message, sender);
-      empathy_message_set_timestamp (message, t);
-      empathy_message_set_tptype (message, msg_type);
-      empathy_message_set_is_backlog (message, TRUE);
-
-      if (cm_id_str)
-        empathy_message_set_id (message, cm_id);
-
-      messages = g_list_append (messages, message);
-
-      g_object_unref (sender);
-      xmlFree (time_);
-      xmlFree (sender_id);
-      xmlFree (sender_name);
-      xmlFree (body);
-      xmlFree (is_user_str);
-      xmlFree (msg_type_str);
-      xmlFree (cm_id_str);
-      xmlFree (sender_avatar_token);
-    }
-
-  DEBUG ("Parsed %d messages", g_list_length (messages));
-
-  xmlFreeDoc (doc);
-  xmlFreeParserCtxt (ctxt);
-
-  return messages;
-}
-
-static GList *
-log_store_empathy_get_all_files (EmpathyLogStore *self,
-                                 const gchar *dir)
-{
-  GDir *gdir;
-  GList *files = NULL;
-  const gchar *name;
-  const gchar *basedir;
-  EmpathyLogStoreEmpathyPriv *priv;
-
-  priv = GET_PRIV (self);
-
-  basedir = dir ? dir : priv->basedir;
-
-  gdir = g_dir_open (basedir, 0, NULL);
-  if (!gdir)
-    return NULL;
-
-  while ((name = g_dir_read_name (gdir)) != NULL)
-    {
-      gchar *filename;
-
-      filename = g_build_filename (basedir, name, NULL);
-      if (g_str_has_suffix (filename, LOG_FILENAME_SUFFIX))
-        {
-          files = g_list_prepend (files, filename);
-          continue;
-        }
-
-      if (g_file_test (filename, G_FILE_TEST_IS_DIR))
-        {
-          /* Recursively get all log files */
-          files = g_list_concat (files,
-              log_store_empathy_get_all_files (self, filename));
-        }
-
-      g_free (filename);
-    }
-
-  g_dir_close (gdir);
-
-  return files;
-}
-
-static GList *
-log_store_empathy_search_new (EmpathyLogStore *self,
-                              const gchar *text)
-{
-  GList *files, *l;
-  GList *hits = NULL;
-  gchar *text_casefold;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
-  g_return_val_if_fail (!EMP_STR_EMPTY (text), NULL);
-
-  text_casefold = g_utf8_casefold (text, -1);
-
-  files = log_store_empathy_get_all_files (self, NULL);
-  DEBUG ("Found %d log files in total", g_list_length (files));
-
-  for (l = files; l; l = g_list_next (l))
-    {
-      gchar *filename;
-      GMappedFile *file;
-      gsize length;
-      gchar *contents = NULL;
-      gchar *contents_casefold = NULL;
-
-      filename = l->data;
-
-      file = g_mapped_file_new (filename, FALSE, NULL);
-      if (file == NULL)
-        goto drinking_island;
-
-      length = g_mapped_file_get_length (file);
-      contents = g_mapped_file_get_contents (file);
-
-      if (length == 0 || contents == NULL)
-        goto drinking_island;
-
-      contents_casefold = g_utf8_casefold (contents, length);
-
-      if (strstr (contents_casefold, text_casefold))
-        {
-          EmpathyLogSearchHit *hit;
-
-          hit = log_store_empathy_search_hit_new (self, filename);
-
-          if (hit)
-            {
-              hits = g_list_prepend (hits, hit);
-              DEBUG ("Found text:'%s' in file:'%s' on date:'%s'",
-                  text, hit->filename, hit->date);
-            }
-        }
-
-drinking_island:
-      if (file != NULL)
-        g_mapped_file_unref (file);
-
-      g_free (contents_casefold);
-      g_free (filename);
-    }
-
-  g_list_free (files);
-  g_free (text_casefold);
-
-  return hits;
-}
-
-static GList *
-log_store_empathy_get_chats_for_dir (EmpathyLogStore *self,
-                                     const gchar *dir,
-                                     gboolean is_chatroom)
-{
-  GDir *gdir;
-  GList *hits = NULL;
-  const gchar *name;
-  GError *error = NULL;
-
-  gdir = g_dir_open (dir, 0, &error);
-  if (!gdir)
-    {
-      DEBUG ("Failed to open directory: %s, error: %s", dir, error->message);
-      g_error_free (error);
-      return NULL;
-    }
-
-  while ((name = g_dir_read_name (gdir)) != NULL)
-    {
-      EmpathyLogSearchHit *hit;
-
-      if (!is_chatroom && strcmp (name, LOG_DIR_CHATROOMS) == 0)
-        {
-          gchar *filename = g_build_filename (dir, name, NULL);
-          hits = g_list_concat (hits, log_store_empathy_get_chats_for_dir (
-                self, filename, TRUE));
-          g_free (filename);
-          continue;
-        }
-      hit = g_slice_new0 (EmpathyLogSearchHit);
-      hit->chat_id = g_strdup (name);
-      hit->is_chatroom = is_chatroom;
-
-      hits = g_list_prepend (hits, hit);
-    }
-
-  g_dir_close (gdir);
-
-  return hits;
-}
-
-
-static GList *
-log_store_empathy_get_messages_for_date (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *chat_id,
-                                         gboolean chatroom,
-                                         const gchar *date)
-{
-  gchar *filename;
-  GList *messages;
-
-  g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
-  g_return_val_if_fail (chat_id != NULL, NULL);
-  g_return_val_if_fail (account != NULL, NULL);
-
-  filename = log_store_empathy_get_filename_for_date (self, account,
-      chat_id, chatroom, date);
-  messages = log_store_empathy_get_messages_for_file (self, account,
-    filename);
-  g_free (filename);
-
-  return messages;
-}
-
-static GList *
-log_store_empathy_get_chats (EmpathyLogStore *self,
-                              TpAccount *account)
-{
-  gchar *dir;
-  GList *hits;
-  EmpathyLogStoreEmpathyPriv *priv;
-
-  priv = GET_PRIV (self);
-
-  dir = log_store_empathy_get_dir (self, account, NULL, FALSE);
-
-  hits = log_store_empathy_get_chats_for_dir (self, dir, FALSE);
-
-  g_free (dir);
-
-  return hits;
-}
-
-static const gchar *
-log_store_empathy_get_name (EmpathyLogStore *self)
-{
-  EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self);
-
-  return priv->name;
-}
-
-static GList *
-log_store_empathy_get_filtered_messages (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *chat_id,
-                                         gboolean chatroom,
-                                         guint num_messages,
-                                         EmpathyLogMessageFilter filter,
-                                         gpointer user_data)
-{
-  GList *dates, *l, *messages = NULL;
-  guint i = 0;
-
-  dates = log_store_empathy_get_dates (self, account, chat_id, chatroom);
-
-  for (l = g_list_last (dates); l && i < num_messages; l = g_list_previous (l))
-    {
-      GList *new_messages, *n, *next;
-
-      /* FIXME: We should really restrict the message parsing to get only
-       * the newest num_messages. */
-      new_messages = log_store_empathy_get_messages_for_date (self, account,
-          chat_id, chatroom, l->data);
-
-      n = new_messages;
-      while (n != NULL)
-        {
-          next = g_list_next (n);
-          if (!filter (n->data, user_data))
-            {
-              g_object_unref (n->data);
-              new_messages = g_list_delete_link (new_messages, n);
-            }
-          else
-            {
-              i++;
-            }
-          n = next;
-        }
-      messages = g_list_concat (messages, new_messages);
-    }
-
-  g_list_foreach (dates, (GFunc) g_free, NULL);
-  g_list_free (dates);
-
-  return messages;
-}
-
-static void
-log_store_iface_init (gpointer g_iface,
-                      gpointer iface_data)
-{
-  EmpathyLogStoreInterface *iface = (EmpathyLogStoreInterface *) g_iface;
-
-  iface->get_name = log_store_empathy_get_name;
-  iface->exists = log_store_empathy_exists;
-  iface->add_message = log_store_empathy_add_message;
-  iface->get_dates = log_store_empathy_get_dates;
-  iface->get_messages_for_date = log_store_empathy_get_messages_for_date;
-  iface->get_chats = log_store_empathy_get_chats;
-  iface->search_new = log_store_empathy_search_new;
-  iface->ack_message = NULL;
-  iface->get_filtered_messages = log_store_empathy_get_filtered_messages;
-}
diff --git a/libempathy/empathy-log-store-empathy.h b/libempathy/empathy-log-store-empathy.h
deleted file mode 100644
index 7290aee..0000000
--- a/libempathy/empathy-log-store-empathy.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Jonny Lamb <jonny.lamb@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_LOG_STORE_EMPATHY_H__
-#define __EMPATHY_LOG_STORE_EMPATHY_H__
-
-#include <config.h>
-#ifndef ENABLE_TPL
-
-#include <glib.h>
-
-#include <telepathy-glib/account.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_LOG_STORE_EMPATHY \
-  (empathy_log_store_empathy_get_type ())
-#define EMPATHY_LOG_STORE_EMPATHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_LOG_STORE_EMPATHY, \
-                               EmpathyLogStoreEmpathy))
-#define EMPATHY_LOG_STORE_EMPATHY_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), EMPATHY_TYPE_LOG_STORE_EMPATHY, \
-                            EmpathyLogStoreEmpathyClass))
-#define EMPATHY_IS_LOG_STORE_EMPATHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_LOG_STORE_EMPATHY))
-#define EMPATHY_IS_LOG_STORE_EMPATHY_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), EMPATHY_TYPE_LOG_STORE_EMPATHY))
-#define EMPATHY_LOG_STORE_EMPATHY_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), EMPATHY_TYPE_LOG_STORE_EMPATHY, \
-                              EmpathyLogStoreEmpathyClass))
-
-typedef struct _EmpathyLogStoreEmpathy EmpathyLogStoreEmpathy;
-typedef struct _EmpathyLogStoreEmpathyClass EmpathyLogStoreEmpathyClass;
-
-struct _EmpathyLogStoreEmpathy
-{
-  GObject parent;
-  gpointer priv;
-};
-
-struct _EmpathyLogStoreEmpathyClass
-{
-  GObjectClass parent;
-};
-
-GType empathy_log_store_empathy_get_type (void);
-
-G_END_DECLS
-
-#endif /* ENABLE_TPL */
-#endif /* __EMPATHY_LOG_STORE_EMPATHY_H__ */
diff --git a/libempathy/empathy-log-store.c b/libempathy/empathy-log-store.c
deleted file mode 100644
index c0769d1..0000000
--- a/libempathy/empathy-log-store.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
- */
-
-#include "empathy-log-store.h"
-
-GType
-empathy_log_store_get_type (void)
-{
-  static GType type = 0;
-  if (type == 0) {
-    static const GTypeInfo info = {
-      sizeof (EmpathyLogStoreInterface),
-      NULL,   /* base_init */
-      NULL,   /* base_finalize */
-      NULL,   /* class_init */
-      NULL,   /* class_finalize */
-      NULL,   /* class_data */
-      0,
-      0,      /* n_preallocs */
-      NULL    /* instance_init */
-    };
-    type = g_type_register_static (G_TYPE_INTERFACE, "EmpathyLogStore",
-        &info, 0);
-  }
-  return type;
-}
-
-const gchar *
-empathy_log_store_get_name (EmpathyLogStore *self)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_name)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_name (self);
-}
-
-gboolean
-empathy_log_store_exists (EmpathyLogStore *self,
-                          TpAccount *account,
-                          const gchar *chat_id,
-                          gboolean chatroom)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->exists)
-    return FALSE;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->exists (
-      self, account, chat_id, chatroom);
-}
-
-
-
-gboolean
-empathy_log_store_add_message (EmpathyLogStore *self,
-                               const gchar *chat_id,
-                               gboolean chatroom,
-                               EmpathyMessage *message,
-                               GError **error)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->add_message)
-    return FALSE;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->add_message (
-      self, chat_id, chatroom, message, error);
-}
-
-GList *
-empathy_log_store_get_dates (EmpathyLogStore *self,
-                             TpAccount *account,
-                             const gchar *chat_id,
-                             gboolean chatroom)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_dates)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_dates (
-      self, account, chat_id, chatroom);
-}
-
-GList *
-empathy_log_store_get_messages_for_date (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *chat_id,
-                                         gboolean chatroom,
-                                         const gchar *date)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_messages_for_date)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_messages_for_date (
-      self, account, chat_id, chatroom, date);
-}
-
-GList *
-empathy_log_store_get_last_messages (EmpathyLogStore *self,
-                                     TpAccount *account,
-                                     const gchar *chat_id,
-                                     gboolean chatroom)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_last_messages)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_last_messages (
-      self, account, chat_id, chatroom);
-}
-
-GList *
-empathy_log_store_get_chats (EmpathyLogStore *self,
-                             TpAccount *account)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_chats)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_chats (self, account);
-}
-
-GList *
-empathy_log_store_search_new (EmpathyLogStore *self,
-                              const gchar *text)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->search_new)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->search_new (self, text);
-}
-
-void
-empathy_log_store_ack_message (EmpathyLogStore *self,
-                               const gchar *chat_id,
-                               gboolean chatroom,
-                               EmpathyMessage *message)
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->ack_message)
-    return;
-
-  EMPATHY_LOG_STORE_GET_INTERFACE (self)->ack_message (
-      self, chat_id, chatroom, message);
-}
-
-GList *
-empathy_log_store_get_filtered_messages (EmpathyLogStore *self,
-                                         TpAccount *account,
-                                         const gchar *chat_id,
-                                         gboolean chatroom,
-                                         guint num_messages,
-                                         EmpathyLogMessageFilter filter,
-                                         gpointer user_data)
-
-{
-  if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_filtered_messages)
-    return NULL;
-
-  return EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_filtered_messages (
-      self, account, chat_id, chatroom, num_messages, filter, user_data);
-}
diff --git a/libempathy/empathy-log-store.h b/libempathy/empathy-log-store.h
deleted file mode 100644
index d8435fb..0000000
--- a/libempathy/empathy-log-store.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_LOG_STORE_H__
-#define __EMPATHY_LOG_STORE_H__
-
-#include <config.h>
-#ifndef ENABLE_TPL
-
-#include <glib-object.h>
-
-#include <telepathy-glib/account.h>
-
-#include "empathy-message.h"
-#include "empathy-log-manager.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_LOG_STORE (empathy_log_store_get_type ())
-#define EMPATHY_LOG_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_LOG_STORE, \
-                               EmpathyLogStore))
-#define EMPATHY_IS_LOG_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_LOG_STORE))
-#define EMPATHY_LOG_STORE_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EMPATHY_TYPE_LOG_STORE, \
-                                  EmpathyLogStoreInterface))
-
-typedef struct _EmpathyLogStore EmpathyLogStore; /* dummy object */
-typedef struct _EmpathyLogStoreInterface EmpathyLogStoreInterface;
-
-struct _EmpathyLogStoreInterface
-{
-  GTypeInterface parent;
-
-  const gchar * (*get_name) (EmpathyLogStore *self);
-  gboolean (*exists) (EmpathyLogStore *self, TpAccount *account,
-      const gchar *chat_id, gboolean chatroom);
-  gboolean (*add_message) (EmpathyLogStore *self, const gchar *chat_id,
-      gboolean chatroom, EmpathyMessage *message, GError **error);
-  GList * (*get_dates) (EmpathyLogStore *self, TpAccount *account,
-      const gchar *chat_id, gboolean chatroom);
-  GList * (*get_messages_for_date) (EmpathyLogStore *self,
-      TpAccount *account, const gchar *chat_id, gboolean chatroom,
-      const gchar *date);
-  GList * (*get_last_messages) (EmpathyLogStore *self, TpAccount *account,
-      const gchar *chat_id, gboolean chatroom);
-  GList * (*get_chats) (EmpathyLogStore *self,
-            TpAccount    *account);
-  GList * (*search_new) (EmpathyLogStore *self, const gchar *text);
-  void (*ack_message) (EmpathyLogStore *self, const gchar *chat_id,
-      gboolean chatroom, EmpathyMessage *message);
-  GList * (*get_filtered_messages) (EmpathyLogStore *self, TpAccount *account,
-      const gchar *chat_id, gboolean chatroom, guint num_messages,
-      EmpathyLogMessageFilter filter, gpointer user_data);
-};
-
-GType empathy_log_store_get_type (void) G_GNUC_CONST;
-
-const gchar *empathy_log_store_get_name (EmpathyLogStore *self);
-gboolean empathy_log_store_exists (EmpathyLogStore *self,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom);
-gboolean empathy_log_store_add_message (EmpathyLogStore *self,
-    const gchar *chat_id, gboolean chatroom, EmpathyMessage *message,
-    GError **error);
-GList *empathy_log_store_get_dates (EmpathyLogStore *self,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom);
-GList *empathy_log_store_get_messages_for_date (EmpathyLogStore *self,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom,
-    const gchar *date);
-GList *empathy_log_store_get_last_messages (EmpathyLogStore *self,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom);
-GList *empathy_log_store_get_chats (EmpathyLogStore *self,
-    TpAccount *account);
-GList *empathy_log_store_search_new (EmpathyLogStore *self,
-    const gchar *text);
-void empathy_log_store_ack_message (EmpathyLogStore *self,
-    const gchar *chat_id, gboolean chatroom, EmpathyMessage *message);
-GList *empathy_log_store_get_filtered_messages (EmpathyLogStore *self,
-    TpAccount *account, const gchar *chat_id, gboolean chatroom,
-    guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data);
-
-G_END_DECLS
-
-#endif /* ENABLE_TPL */
-#endif /* __EMPATHY_LOG_STORE_H__ */
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index ab9e95d..3d755c9 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -27,14 +27,12 @@
 #include <string.h>
 
 #include <telepathy-glib/util.h>
-#ifdef ENABLE_TPL
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/account-manager.h>
 
 #include <telepathy-logger/entity.h>
 #include <telepathy-logger/entry.h>
 #include <telepathy-logger/entry-text.h>
-#endif /* ENABLE_TPL */
 
 #include "empathy-message.h"
 #include "empathy-utils.h"
@@ -260,7 +258,6 @@ empathy_message_new (const gchar *body)
 			     NULL);
 }
 
-#ifdef ENABLE_TPL
 EmpathyMessage *
 empathy_message_from_tpl_log_entry (TplEntry *logentry)
 {
@@ -323,7 +320,6 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry)
 
 	return retval;
 }
-#endif /* ENABLE_TPL */
 
 TpChannelTextMessageType
 empathy_message_get_tptype (EmpathyMessage *message)
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index d7f29f7..b7a63f8 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -26,9 +26,7 @@
 #define __EMPATHY_MESSAGE_H__
 
 #include <glib-object.h>
-#ifdef ENABLE_TPL
 #include <telepathy-logger/entry.h>
-#endif
 
 #include "empathy-contact.h"
 #include "empathy-time.h"
@@ -56,9 +54,7 @@ struct _EmpathyMessageClass {
 
 GType                    empathy_message_get_type          (void) G_GNUC_CONST;
 EmpathyMessage *         empathy_message_new               (const gchar              *body);
-#ifdef ENABLE_TPL
 EmpathyMessage *         empathy_message_from_tpl_log_entry (TplEntry                *logentry);
-#endif /* ENABLE_TPL */
 TpChannelTextMessageType empathy_message_get_tptype        (EmpathyMessage           *message);
 void                     empathy_message_set_tptype        (EmpathyMessage           *message,
 							    TpChannelTextMessageType  type);
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 83db1b6..adc9bfb 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES =					\
 	$(NST_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
-	$(TPL_CFLAGS) \
 	$(EMPATHY_CFLAGS)
 
 plugin_LTLIBRARIES = libnstempathy.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 41020dd..6f8017f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,6 @@ CPPFLAGS_COMMON =					\
 AM_LDFLAGS = -lm
 AM_CPPFLAGS =						\
 	$(CPPFLAGS_COMMON)				\
-	$(TPL_CFLAGS)					\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
 	$(WEBKIT_CFLAGS)				\
@@ -23,7 +22,6 @@ LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(top_builddir)/extensions/libemp-extensions.la		\
-	$(TPL_LIBS)						\
 	$(LIBNOTIFY_LIBS)					\
 	$(EMPATHY_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
diff --git a/src/empathy.c b/src/empathy.c
index 552b8e1..5a6b131 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,12 +44,8 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
-#ifdef ENABLE_TPL
 #include <telepathy-logger/log-manager.h>
-#else
 
-#include <libempathy/empathy-log-manager.h>
-#endif /* ENABLE_TPL */
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-call-factory.h>
@@ -576,11 +572,7 @@ main (int argc, char *argv[])
   EmpathyStatusIcon *icon;
   EmpathyDispatcher *dispatcher;
   TpAccountManager *account_manager;
-#ifdef ENABLE_TPL
   TplLogManager *log_manager;
-#else
-  EmpathyLogManager *log_manager;
-#endif /* ENABLE_TPL */
   EmpathyChatroomManager *chatroom_manager;
   EmpathyCallFactory *call_factory;
   EmpathyFTFactory  *ft_factory;
@@ -701,12 +693,7 @@ main (int argc, char *argv[])
       G_CALLBACK (unique_app_message_cb), window);
 
   /* Logging */
-#ifdef ENABLE_TPL
   log_manager = tpl_log_manager_dup_singleton ();
-#else
-  log_manager = empathy_log_manager_dup_singleton ();
-  empathy_log_manager_observe (log_manager, dispatcher);
-#endif
 
   chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
   empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 15503ac..cf3d84c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,14 +13,12 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
-	$(TPL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
-	$(TPL_LIBS) \
 	$(EMPATHY_LIBS)
 
 TEST_PROGS =                                     \
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 5d3a66f..8fc19eb 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -3,14 +3,12 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
-	$(TPL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
-	$(TPL_LIBS) \
 	$(EMPATHY_LIBS)
 
 noinst_PROGRAMS =			\
