diff --git a/src/gcal-application.c b/src/gcal-application.c
index 1556666e..5072cfd7 100644
--- a/src/gcal-application.c
+++ b/src/gcal-application.c
@@ -364,10 +364,7 @@ gcal_application_startup (GApplication *app)
 
   /* We're assuming the application is called as a service only by the shell search system */
   if ((g_application_get_flags (app) & G_APPLICATION_IS_SERVICE) != 0)
-    {
-      g_application_set_inactivity_timeout (app, 3 * 60 * 1000);
-      g_debug ("[%s]: set_inactivity_timeout: %d", G_STRFUNC, 3 * 60 * 1000);
-    }
+    g_application_set_inactivity_timeout (app, 3 * 60 * 1000);
 }
 
 static gint
diff --git a/src/gcal-shell-search-provider.c b/src/gcal-shell-search-provider.c
index a994671f..a826ccc7 100644
--- a/src/gcal-shell-search-provider.c
+++ b/src/gcal-shell-search-provider.c
@@ -89,7 +89,6 @@ execute_search (GcalShellSearchProvider *search_provider)
   gcal_manager_set_shell_search_subscriber (priv->manager, E_CAL_DATA_MODEL_SUBSCRIBER (search_provider),
                                             range_start, range_end);
 
-  /* FIXME: terms */
   search_query = g_strdup_printf ("(or (contains? \"summary\" \"%s\") (contains? \"description\" \"%s\"))",
                                   priv->pending_search->terms[0], priv->pending_search->terms[0]);
   for (i = 1; i < g_strv_length (priv->pending_search->terms); i++)
@@ -150,9 +149,8 @@ schedule_search (GcalShellSearchProvider *search_provider,
   priv->pending_search->terms = g_strdupv (terms);
 
   if (!gcal_manager_load_completed (priv->manager))
-   {
+    {
       priv->scheduled_search_id = g_timeout_add_seconds (1, (GSourceFunc) execute_search, search_provider);
-      g_debug ("[%s]: scheduling search", G_STRFUNC);
       return;
     }