diff --git a/rpm/mapplauncherd.spec b/rpm/mapplauncherd.spec
index fa395b7..33a881c 100644
--- a/rpm/mapplauncherd.spec
+++ b/rpm/mapplauncherd.spec
@@ -1,13 +1,4 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
-# 
-
 Name:       mapplauncherd
-
-# >> macros
-# << macros
-
 Summary:    Application launcher for fast startup
 Version:    4.1.0
 Release:    1
@@ -15,7 +6,6 @@ Group:      System/Daemons
 License:    LGPLv2+
 URL:        https://github.com/nemomobile/mapplauncherd/
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  mapplauncherd.yaml
 Requires:   systemd-user-session-targets
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -49,36 +39,23 @@ using mapplauncherd.
 %prep
 %setup -q -n %{name}-%{version}
 
-# >> setup
-# << setup
-
 %build
-# >> build pre
 export BUILD_TESTS=1
 export MEEGO=1
 unset LD_AS_NEEDED
-# << build pre
 
 %configure --disable-static
 make %{?jobs:-j%jobs}
 
-# >> build post
-# << build post
-
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
-
 # Don't use %exclude, remove at install phase
 rm -f %{buildroot}/usr/share/fala_images/fala_qml_helloworld
 
 mkdir -p %{buildroot}/usr/lib/systemd/user/user-session.target.wants || true
 ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/user-session.target.wants/
-# << install post
 
 %pre
 groupadd -rf privileged
@@ -95,11 +72,7 @@ groupadd -rf privileged
 %attr(2755, root, privileged) %{_libexecdir}/mapplauncherd/booster-generic
 %{_libdir}/systemd/user/booster-generic.service
 %{_libdir}/systemd/user/user-session.target.wants/booster-generic.service
-# >> files
-# << files
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/applauncherd/*
-# >> files devel
-# << files devel
diff --git a/rpm/mapplauncherd.yaml b/rpm/mapplauncherd.yaml
deleted file mode 100644
index ef0fb77..0000000
--- a/rpm/mapplauncherd.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-Name: mapplauncherd
-Summary: Application launcher for fast startup
-Version: 4.1.0
-Release: 1
-Group: System/Daemons
-License: LGPLv2+
-URL: https://github.com/nemomobile/mapplauncherd/
-Sources:
-    - "%{name}-%{version}.tar.bz2"
-Description: |
-    Application invoker and launcher daemon that speed up
-    application startup time and share memory. Provides also
-    functionality to launch applications as single instances.
-PkgConfigBR:
-    - systemd
-    - dbus-1
-PkgBR:
-    - cmake
-    - python
-Requires:
-    - systemd-user-session-targets
-Provides:
-    - meegotouch-applauncherd > 3.0.3
-Obsoletes:
-    - meegotouch-applauncherd <= 3.0.3
-Builder: make
-Files:
-    - "%{_bindir}/invoker"
-    - "%{_bindir}/single-instance"
-    - "%{_libdir}/libapplauncherd.so*"
-    - "%{_libexecdir}/mapplauncherd/booster-generic"
-    - "%{_libdir}/systemd/user/booster-generic.service"
-    - "%{_libdir}/systemd/user/user-session.target.wants/booster-generic.service"
-
-SubPackages:
-    - Name: devel
-      Group: Development/Tools
-      Summary: Development files for launchable applications
-      Description: |
-         Development files for creating applications that can be launched
-         using mapplauncherd.
-      Provides:
-        - meegotouch-applauncherd-devel > 3.0.3
-      Obsoletes:
-        - meegotouch-applauncherd-devel <= 3.0.3
-      Files:
-        - "%{_includedir}/applauncherd/*"