diff --git a/kdeui/widgets/kmainwindow.h b/kdeui/widgets/kmainwindow.h
index 8b44b745..93969d53 100644
--- a/kdeui/widgets/kmainwindow.h
+++ b/kdeui/widgets/kmainwindow.h
@@ -50,9 +50,6 @@ class KToolBar;
     inline const classname ## Private *k_func() const { return reinterpret_cast<classname ## Private *>(k_ptr); } \
     friend class classname ## Private;
 
-// This is mostly from KDE3. TODO KDE5: remove the constructor parameter.
-#define KDE_DEFAULT_WINDOWFLAGS 0
-
 /**
  * @short %KDE top level main window
  *
@@ -147,7 +144,7 @@ public:
      * for the composer windows "composer#".
      *
      */
-    explicit KMainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS );
+    explicit KMainWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
 
     /**
      * \brief Destructor.
diff --git a/kdeui/xmlgui/kxmlguiwindow.h b/kdeui/xmlgui/kxmlguiwindow.h
index c8376887..0137115c 100644
--- a/kdeui/xmlgui/kxmlguiwindow.h
+++ b/kdeui/xmlgui/kxmlguiwindow.h
@@ -41,8 +41,6 @@ class KConfigGroup;
 class KToolBar;
 class KXmlGuiWindowPrivate;
 
-#define KDE_DEFAULT_WINDOWFLAGS 0
-
 /**
  * @short %KDE top level main window with predefined action layout
  *
@@ -104,7 +102,7 @@ public:
      * for the composer windows "composer#".
      *
      */
-    explicit KXmlGuiWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS );
+    explicit KXmlGuiWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
 
     /**
      * \brief Destructor.
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc
index 21931d13..8ebd1716 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/kio/bookmarks/kbookmark.cc
@@ -345,14 +345,6 @@ QString KBookmark::icon() const
     QDomElement iconElement = cd(metaDataNode, "bookmark:icon", false).toElement();
 
     QString icon = iconElement.attribute("name");
-
-    // migration code
-    if (icon.isEmpty())
-      icon = element.attribute("icon");
-    if (icon == "www") // common icon for kde3 bookmarks
-        return "internet-web-browser";
-    // end migration code
-
     if (icon == "bookmark_folder") {
         return "folder-bookmarks";
     }
diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h
index f11a3286..e0da0c46 100644
--- a/kparts/mainwindow.h
+++ b/kparts/mainwindow.h
@@ -50,7 +50,7 @@ class KPARTS_EXPORT MainWindow : public KXmlGuiWindow, virtual public PartBase
   /**
    * Constructor, same signature as KMainWindow.
    */
-  explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS );
+  explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
   /**
    * Destructor.
    */