diff --git a/midori/midori-app.c b/midori/midori-app.c
index 52148978..9dddad6c 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -777,23 +777,18 @@ midori_app_set_property (GObject*      object,
         break;
     case PROP_SETTINGS:
         katze_object_assign (app->settings, g_value_dup_object (value));
-        /* FIXME: Propagate settings to all browsers */
         break;
     case PROP_BOOKMARKS:
         katze_object_assign (app->bookmarks, g_value_dup_object (value));
-        /* FIXME: Propagate bookmarks to all browsers */
         break;
     case PROP_TRASH:
         katze_object_assign (app->trash, g_value_dup_object (value));
-        /* FIXME: Propagate trash to all browsers */
         break;
     case PROP_SEARCH_ENGINES:
         katze_object_assign (app->search_engines, g_value_dup_object (value));
-        /* FIXME: Propagate search engines to all browsers */
         break;
     case PROP_HISTORY:
         katze_object_assign (app->history, g_value_dup_object (value));
-        /* FIXME: Propagate history to all browsers */
         break;
     case PROP_EXTENSIONS:
         katze_object_assign (app->extensions, g_value_dup_object (value));
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0a17b7ac..a2bf527a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2131,7 +2131,6 @@ _action_private_browsing_activate (GtkAction*     action,
     const gchar* uri = midori_browser_get_current_uri (browser);
     if (uri != NULL)
     {
-        /* FIXME: Use the same binary that is running right now */
         if (*uri != '\0')
             midori_browser_spawn_app (uri);
         else
@@ -2748,7 +2747,6 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
     if (!uri_fixed)
         uri_fixed = g_strdup (uri);
 
-    /* FIXME: Use the same binary that is running right now */
     if (katze_item_get_meta_boolean (item, "app"))
         midori_browser_spawn_app (uri_fixed);
     else
@@ -3225,7 +3223,6 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request,
                 fclose (fp);
                 if ((ret - request->length) != 0)
                 {
-                    /* FIXME: Show an error in the graphical interface */
                     g_warning ("Error writing to file %s "
                                "in midori_browser_source_transfer_cb()", filename);
                 }
@@ -3279,7 +3276,6 @@ _action_source_view_activate (GtkAction*     action,
         #else
         GError* error = NULL;
 
-        /* FIXME: Handling http transparently in the function would be nice */
         if (g_str_has_prefix (uri, "file://"))
         {
             if (!sokoke_show_uri_with_mime_type (gtk_widget_get_screen (view),
@@ -5577,7 +5573,6 @@ midori_browser_init (MidoriBrowser* browser)
     error = NULL;
     if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error))
     {
-        /* TODO: Should this be a message dialog? When does this happen? */
         g_message ("User interface couldn't be created: %s", error->message);
         g_error_free (error);
     }
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index cecda90e..152b1729 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -545,7 +545,6 @@ midori_location_action_popup_completion (MidoriLocationAction* action,
         G_CALLBACK (gtk_widget_destroyed), &action->entry);
     action->completion_timeout = g_timeout_add (COMPLETION_DELAY,
         midori_location_action_popup_timeout_cb, action);
-    /* TODO: Inline completion */
 }
 
 static void
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 1a731979..c24f60b9 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -420,7 +420,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     #endif
     #if WEBKIT_CHECK_VERSION (1, 1, 6)
     FRAME_NEW (_("Spell Checking"));
-    /* FIXME: Provide a nice dictionary selection */
     button = katze_property_proxy (settings, "enable-spell-checking", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking"));
     gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing"));
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 4ecd00dd..918e6eb3 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1669,7 +1669,6 @@ static void
 midori_web_view_menu_web_app_activate_cb (GtkWidget*  widget,
                                           MidoriView* view)
 {
-    /* FIXME: Use the same binary that is running right now */
     sokoke_spawn_program ("midori -a", view->link_uri, FALSE);
 }