diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index e65edc8a..6695a685 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -235,10 +235,6 @@
 # this is required by cmake >=2.6
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
-# CMake 2.6, set compatibility behaviour to cmake 2.4
-# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
-# resets the policy settings, so we get a lot of warnings
-
 # CMP0000: don't require cmake_minimum_version() directly in the top level
 # CMakeLists.txt, FindKDE4Internal.cmake is good enough
 cmake_policy(SET CMP0000 OLD)
diff --git a/cmake/modules/FindLibXslt.cmake b/cmake/modules/FindLibXslt.cmake
index 1c55c4c5..64442ced 100644
--- a/cmake/modules/FindLibXslt.cmake
+++ b/cmake/modules/FindLibXslt.cmake
@@ -51,8 +51,6 @@ ELSE (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
 FIND_PROGRAM(LIBXSLT_XSLTPROC_EXECUTABLE xsltproc)
-# For compatibility with FindLibXslt.cmake from KDE 4.[01].x
-SET(XSLTPROC_EXECUTABLE ${LIBXSLT_XSLTPROC_EXECUTABLE})
 
 IF (LIBXSLT_FOUND)
    IF (NOT LibXslt_FIND_QUIETLY)
diff --git a/dnssd/CreateKcfgFiles.cmake b/dnssd/CreateKcfgFiles.cmake
index b5bd803d..a9c0e098 100644
--- a/dnssd/CreateKcfgFiles.cmake
+++ b/dnssd/CreateKcfgFiles.cmake
@@ -1,8 +1,8 @@
 if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
    set(KDNSSD_SETTINGS_BASE_CLASS "KCoreConfigSkeleton")
-else(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
+else()
    set(KDNSSD_SETTINGS_BASE_CLASS "KConfigSkeleton")
-endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/settings.kcfgc
 "ClassName=Configuration
diff --git a/kdeclarative/CMakeLists.txt b/kdeclarative/CMakeLists.txt
index b77caebe..d0affe56 100644
--- a/kdeclarative/CMakeLists.txt
+++ b/kdeclarative/CMakeLists.txt
@@ -2,7 +2,7 @@ project(kdeclarative)
 
 if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(KDECLARATIVE_NO_KIO TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 8c0d71a1..9d2926f8 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories( ${KDE4_KIO_INCLUDES} )
 
 if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(KBUILDSYCOCA_NO_KCRASH TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake
diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
index f974a9d5..0b99a2c4 100644
--- a/kioslave/http/http.cpp
+++ b/kioslave/http/http.cpp
@@ -3450,8 +3450,7 @@ endParsing:
 
         // We need to reread the header if we got a '100 Continue' or '102 Processing'
         // This may be a non keepalive connection so we handle this kind of loop internally
-        if ( cont )
-        {
+        if ( cont ) {
             kDebug(7113) << "cont; returning to mark try_again";
             goto try_again;
         }
diff --git a/kjs/ExecState.h b/kjs/ExecState.h
index bc85bcc1..1ef82022 100644
--- a/kjs/ExecState.h
+++ b/kjs/ExecState.h
@@ -232,9 +232,6 @@ namespace KJS {
     // important property lookup functions, to avoid taking PIC branches in Mach-O binaries
     const CommonIdentifiers& propertyNames() const { return *m_propertyNames; }
 
-    // Compatibility stuff:
-    ExecState* context() { return this; }
-    ExecState* callingContext() { return callingExecState(); }
   protected:
     ExecState(Interpreter* intp, ExecState* save);
     ~ExecState();
@@ -276,8 +273,6 @@ namespace KJS {
     CodeType m_codeType;
   };
 
-  typedef ExecState Context; // Compatibility only
-
     class GlobalExecState : public ExecState {
     public:
         GlobalExecState(Interpreter* intp, JSGlobalObject* global);
diff --git a/plasma/corona.cpp b/plasma/corona.cpp
index 98cbb361..900895f5 100644
--- a/plasma/corona.cpp
+++ b/plasma/corona.cpp
@@ -448,14 +448,8 @@ QRegion Corona::availableScreenRegion(int id) const
     return QRegion(screenGeometry(id));
 }
 
-QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s)
-{
-    return popupPosition(item, s, Qt::AlignLeft);
-}
-
 QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::AlignmentFlag alignment)
 {
-    // TODO: merge both methods (also these in Applet) into one (with optional alignment) when we can break compatibility
     // TODO: add support for more flags in the future?
 
     const QGraphicsItem *actualItem = item;
diff --git a/plasma/corona.h b/plasma/corona.h
index 5dc2e1c7..b9b44ce9 100644
--- a/plasma/corona.h
+++ b/plasma/corona.h
@@ -194,15 +194,6 @@ public:
      */
     virtual QRegion availableScreenRegion(int id) const;
 
-    /**
-    * Recommended position for a popup window like a menu or a tooltip
-    * given its size
-    * @param item the item that the popup should appear adjacent to (an applet, say)
-    * @param size size of the popup
-    * @returns reccomended position
-    */
-    QPoint popupPosition(const QGraphicsItem *item, const QSize &size);
-
     /**
      * @since 4.4
     * Recommended position for a popup window like a menu or a tooltip
@@ -212,7 +203,7 @@ public:
     * @param alignment alignment of the popup, valid flags are Qt::AlignLeft, Qt::AlignRight and Qt::AlignCenter
     * @returns reccomended position
     */
-    QPoint popupPosition(const QGraphicsItem *item, const QSize &size, Qt::AlignmentFlag alignment);
+    QPoint popupPosition(const QGraphicsItem *item, const QSize &size, Qt::AlignmentFlag alignment = Qt::AlignLeft);
 
     /**
      * This method is useful in order to retrieve the list of available