diff --git a/clients/aurorae/src/aurorae.desktop b/clients/aurorae/src/aurorae.desktop
index 4dfc5b4bec..0ff504b840 100644
--- a/clients/aurorae/src/aurorae.desktop
+++ b/clients/aurorae/src/aurorae.desktop
@@ -22,5 +22,4 @@ Name[tr]=Aurorae Dekorasyon Teması Motoru
 Name[uk]=Рушій декорації тем Aurorae
 Name[x-test]=xxAurorae Decoration Theme Enginexx
 Name[zh_TW]=Aurorae 裝飾主題引擎
-Type=Decoration
 X-KDE-Library=kwin3_aurorae
diff --git a/clients/aurorae/themes/example-deco/metadata.desktop b/clients/aurorae/themes/example-deco/metadata.desktop
index fd3be23d14..7c0028c07d 100644
--- a/clients/aurorae/themes/example-deco/metadata.desktop
+++ b/clients/aurorae/themes/example-deco/metadata.desktop
@@ -47,7 +47,6 @@ Comment[uk]=Приклад теми, заснованої на темі стіл
 Comment[x-test]=xxAn example theme based on the Air desktop theme.xx
 Comment[zh_TW]=基於 Air 桌面主題的範例主題
 
-Type=Theme
 X-KDE-PluginInfo-Author=Martin Gräßlin
 X-KDE-PluginInfo-Email=kde@martin-graesslin.com
 X-KDE-PluginInfo-Name=example-deco
diff --git a/clients/b2/b2.desktop b/clients/b2/b2.desktop
index b210dce99d..23aed9d85e 100644
--- a/clients/b2/b2.desktop
+++ b/clients/b2/b2.desktop
@@ -82,5 +82,4 @@ Name[xh]=B II
 Name[x-test]=xxB IIxx
 Name[zh_CN]=B II
 Name[zh_TW]=B II
-Type=Decoration
 X-KDE-Library=kwin3_b2
diff --git a/clients/kde2/kde2.desktop b/clients/kde2/kde2.desktop
index 1f85e3d20e..279ffb5ef2 100644
--- a/clients/kde2/kde2.desktop
+++ b/clients/kde2/kde2.desktop
@@ -85,5 +85,4 @@ Name[xh]=KDE 2
 Name[x-test]=xxKDE 2xx
 Name[zh_CN]=KDE 2
 Name[zh_TW]=KDE 2
-Type=Decoration
 X-KDE-Library=kwin3_kde2
diff --git a/clients/keramik/keramik.desktop b/clients/keramik/keramik.desktop
index a30acf1c20..b88b4b3902 100644
--- a/clients/keramik/keramik.desktop
+++ b/clients/keramik/keramik.desktop
@@ -85,5 +85,4 @@ Name[xh]=Keramik
 Name[x-test]=xxKeramikxx
 Name[zh_CN]=Keramik
 Name[zh_TW]=Keramik
-Type=Decoration
 X-KDE-Library=kwin3_keramik
diff --git a/clients/kwmtheme/kwmtheme.desktop b/clients/kwmtheme/kwmtheme.desktop
index 631cc5aa9b..cfc096cadc 100644
--- a/clients/kwmtheme/kwmtheme.desktop
+++ b/clients/kwmtheme/kwmtheme.desktop
@@ -83,5 +83,4 @@ Name[xh]=Umxholo we KWM
 Name[x-test]=xxKWM Themexx
 Name[zh_CN]=KWM 主题
 Name[zh_TW]=KWM 主題
-Type=Decoration
 X-KDE-Library=kwin3_kwmtheme
diff --git a/clients/laptop/laptop.desktop b/clients/laptop/laptop.desktop
index 71ed67438a..1122dc7180 100644
--- a/clients/laptop/laptop.desktop
+++ b/clients/laptop/laptop.desktop
@@ -83,5 +83,4 @@ Name[xh]=Umphezulu osongiweyo
 Name[x-test]=xxLaptopxx
 Name[zh_CN]=笔记本电脑
 Name[zh_TW]=筆記型電腦
-Type=Decoration
 X-KDE-Library=kwin3_laptop
diff --git a/clients/modernsystem/modernsystem.desktop b/clients/modernsystem/modernsystem.desktop
index d5d2efd226..4dff4a8927 100644
--- a/clients/modernsystem/modernsystem.desktop
+++ b/clients/modernsystem/modernsystem.desktop
@@ -82,5 +82,4 @@ Name[wa]=Sistinme modiene
 Name[x-test]=xxModern Systemxx
 Name[zh_CN]=现代系统
 Name[zh_TW]=現代系統
-Type=Decoration
 X-KDE-Library=kwin3_modernsys
diff --git a/clients/oxygen/oxygenclient.desktop b/clients/oxygen/oxygenclient.desktop
index 3504b9018a..06984cb0d1 100644
--- a/clients/oxygen/oxygenclient.desktop
+++ b/clients/oxygen/oxygenclient.desktop
@@ -80,5 +80,4 @@ Name[wa]=Ocsidjinne
 Name[x-test]=xxOxygenxx
 Name[zh_CN]=Oxygen
 Name[zh_TW]=Oxygen
-Type=Decoration
 X-KDE-Library=kwin3_oxygen
diff --git a/clients/plastik/plastik.desktop b/clients/plastik/plastik.desktop
index 9b183a5257..e6a098510f 100644
--- a/clients/plastik/plastik.desktop
+++ b/clients/plastik/plastik.desktop
@@ -83,5 +83,4 @@ Name[wa]=Plastike
 Name[x-test]=xxPlastikxx
 Name[zh_CN]=Plastik
 Name[zh_TW]=Plastik
-Type=Decoration
 X-KDE-Library=kwin3_plastik
diff --git a/clients/quartz/quartz.desktop b/clients/quartz/quartz.desktop
index 1d4ac7b08d..f348792ae6 100644
--- a/clients/quartz/quartz.desktop
+++ b/clients/quartz/quartz.desktop
@@ -83,5 +83,4 @@ Name[xh]=Quartz
 Name[x-test]=xxQuartzxx
 Name[zh_CN]=Quartz
 Name[zh_TW]=石英
-Type=Decoration
 X-KDE-Library=kwin3_quartz
diff --git a/clients/redmond/redmond.desktop b/clients/redmond/redmond.desktop
index e9b3141da6..7126993494 100644
--- a/clients/redmond/redmond.desktop
+++ b/clients/redmond/redmond.desktop
@@ -84,5 +84,4 @@ Name[xh]=Redmond
 Name[x-test]=xxRedmondxx
 Name[zh_CN]=Redmond
 Name[zh_TW]=Redmond
-Type=Decoration
 X-KDE-Library=kwin3_redmond
diff --git a/clients/test/test.desktop b/clients/test/test.desktop
index 5e84aaf011..41e0117c64 100644
--- a/clients/test/test.desktop
+++ b/clients/test/test.desktop
@@ -81,5 +81,4 @@ Name[wa]=Saye KWin
 Name[x-test]=xxKWin testxx
 Name[zh_CN]=KWin 测试
 Name[zh_TW]=KWin 測試
-Type=Decoration
 X-KDE-Library=kwin3_test
diff --git a/clients/web/web.desktop b/clients/web/web.desktop
index fa33599aa5..8627e22ccd 100644
--- a/clients/web/web.desktop
+++ b/clients/web/web.desktop
@@ -84,5 +84,4 @@ Name[xh]=Web
 Name[x-test]=xxWebxx
 Name[zh_CN]=网页
 Name[zh_TW]=網頁
-Type=Decoration
 X-KDE-Library=kwin3_web
diff --git a/effects.cpp b/effects.cpp
index d6eb1ea09d..d1c1d9358c 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -903,7 +903,7 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
     assert( current_build_quads == 0 );
     assert( current_transform == 0 );
 
-    if( !name.toLatin1().startsWith("kwin4_effect_") )
+    if( !name.startsWith("kwin4_effect_") )
         kWarning( 1212 ) << "Effect names usually have kwin4_effect_ prefix" ;
 
     // Make sure a single effect won't be loaded multiple times
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index ab9754414e..4b17d560b1 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -227,7 +227,7 @@ void KWinDecorationModule::findDecorations()
 					KDesktopFile desktopFile(filename);
 					QString libName = desktopFile.desktopGroup().readEntry("X-KDE-Library");
 
-					if (!libName.isEmpty() && libName.toLatin1().startsWith( "kwin3_" ))
+					if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
 					{
 						DecorationInfo di;
 						di.name = desktopFile.readName();
@@ -590,7 +590,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
 
 QString KWinDecorationModule::styleToConfigLib( QString& styleLib )
 {
-        if( styleLib.toLatin1().startsWith( "kwin3_" ))
+        if( styleLib.startsWith( "kwin3_" ))
             return "kwin_" + styleLib.mid( 6 ) + "_config";
         else
             return styleLib + "_config";
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index ba1731aaf2..bd4a9db0de 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -106,7 +106,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
         nameStr = group.readEntry("PluginLib", defaultPlugin );
         }
     // make sure people can switch between HEAD and kwin_iii branch
-    if( nameStr.toLatin1().startsWith( "kwin_" ))
+    if( nameStr.startsWith( "kwin_" ))
 	nameStr = "kwin3_" + nameStr.mid( 5 );
 
     KLibrary *oldLibrary = library;