diff --git a/kamoso/src/CMakeLists.txt b/kamoso/src/CMakeLists.txt
index adab40fa..81c0cb01 100644
--- a/kamoso/src/CMakeLists.txt
+++ b/kamoso/src/CMakeLists.txt
@@ -3,10 +3,6 @@ include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT
 add_definitions(-DGST_DISABLE_DEPRECATED)
 add_definitions(-fexceptions)
 
-if (NEPOMUK_FOUND)
-	include_directories(${NEPOMUK_INCLUDE_DIRS})
-endif(NEPOMUK_FOUND)
-
 add_subdirectory(plugins)
 add_subdirectory(pluginTester)
 
@@ -46,10 +42,6 @@ kde4_add_executable(kamoso ${kamoso_SRCS})
 target_link_libraries(kamoso ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
         ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS} ${KIPI_LIBRARIES} ${SolidControl} ${QTGSTREAMER_LIBRARY} ${QTGSTREAMER_UI_LIBRARY})
 
-if(HAVE_NEPOMUK)
-	target_link_libraries(kamoso ${NEPOMUK_LIBRARIES})
-endif(HAVE_NEPOMUK)
-
 install(TARGETS kamoso ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/kamoso/src/kamoso.cpp b/kamoso/src/kamoso.cpp
index ca4a1bfc..a2369f3a 100644
--- a/kamoso/src/kamoso.cpp
+++ b/kamoso/src/kamoso.cpp
@@ -39,11 +39,7 @@
 #include "kipiaction.h"
 #include "webcamdialog.h"
 #include "pagewebcamconfigmanager.h"
-#if KDE_IS_VERSION(4,5,85)
-    #include "brightness_interface.h"
-#else
-    #include <solid/control/powermanager.h>
-#endif
+#include "brightness_interface.h"
 
 #include <QItemSelection>
 #include <QLayout>
@@ -438,14 +434,9 @@ void Kamoso::takePhoto()
     stopCountdown();
 
     if(m_flashEnabled){
-        #if KDE_IS_VERSION(4,5,85)
-            org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
-            brightBack = power.brightness().value();
-            power.setBrightness(100);
-        #else
-            brightBack = Solid::Control::PowerManager::brightness();
-            Solid::Control::PowerManager::setBrightness(100);
-        #endif
+        org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
+        brightBack = power.brightness().value();
+        power.setBrightness(100);
         whiteWidgetManager->showAll();
     }
     QTimer::singleShot(1000, this, SLOT(restore()));
@@ -479,12 +470,8 @@ void Kamoso::restore()
 {
     whiteWidgetManager->hideAll();
     if(m_flashEnabled) {
-        #if KDE_IS_VERSION(4,5,85)
-            org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
-            power.setBrightness(brightBack);
-        #else
-            Solid::Control::PowerManager::setBrightness(brightBack);
-        #endif
+        org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
+        power.setBrightness(brightBack);
     }
 }
 
diff --git a/kamoso/src/kamoso.h b/kamoso/src/kamoso.h
index 26d7adaf..da9d5117 100644
--- a/kamoso/src/kamoso.h
+++ b/kamoso/src/kamoso.h
@@ -107,12 +107,7 @@ Q_OBJECT
     private:
         QPointer<QMenu> exportKIPIMenu();
 
-        #if KDE_IS_VERSION(4,5,85)
-            int brightBack;
-        #else
-            float brightBack;
-        #endif
-
+        int brightBack;
         int m_webcamId;
         KDirModel *dirModel;
         WhiteWidgetManager *whiteWidgetManager;