diff --git a/org.deluge_torrent.deluge.yaml b/org.deluge_torrent.deluge.yaml
index 0f8c78d..9590771 100644
--- a/org.deluge_torrent.deluge.yaml
+++ b/org.deluge_torrent.deluge.yaml
@@ -13,24 +13,23 @@ finish-args:
   - --talk-name=org.kde.StatusNotifierWatcher
   - --filesystem=xdg-download
 
+cleanup:
+  - /cache
+  - /man
+  - /share/aclocal
+  - /share/devhelp
+  - /include
+  - /lib/pkgconfig
+  - /share/gtk-doc
+  - /share/man
+  - /lib/*.a
+  - /lib/*.la
+
 modules:
 
 - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
 
 - name: boost
-  cleanup: [
-        "/cache",
-        "/man",
-        "/share/aclocal",
-        "/share/devhelp",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/gtk-doc",
-        "/share/man",
-        "/lib/*.a",
-        "*.a",
-        "*.la"
-    ]
   buildsystem: simple
   sources:
   - type: archive
@@ -48,20 +47,6 @@ modules:
     - -DCMAKE_BUILD_TYPE=RelWithDebInfo
     - -Dpython-bindings=ON 
     - -Dboost-python-module-name=python
-    
-  cleanup: [
-        "/cache",
-        "/man",
-        "/share/aclocal",
-        "/share/devhelp",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/gtk-doc",
-        "/share/man",
-        "/lib/*.a",
-        "*.a",
-        "*.la"
-  ]
   sources:
     - type: archive
       url: https://github.com/arvidn/libtorrent/releases/download/v1.2.12/libtorrent-rasterbar-1.2.12.tar.gz
@@ -71,8 +56,6 @@ modules:
 - name: wheel
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -82,8 +65,6 @@ modules:
 - name: six
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -93,7 +74,6 @@ modules:
 - name: Cython
   buildsystem: simple
   build-commands: 
-  - python3 setup.py build
   - python3 setup.py install --prefix=/app
   sources:
   - type: archive
@@ -103,7 +83,6 @@ modules:
 - name: rencode
   buildsystem: simple
   build-commands: 
-  - python3 setup.py build
   - python3 setup.py install --prefix=/app
   sources:
   - type: archive
@@ -113,8 +92,6 @@ modules:
 - name: pycparser
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -124,8 +101,6 @@ modules:
 - name: cffi
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -135,8 +110,6 @@ modules:
 - name: cryptography
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -146,8 +119,6 @@ modules:
 - name: pyopenssl
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -157,8 +128,6 @@ modules:
 - name: pyasn1
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -168,8 +137,6 @@ modules:
 - name: pyasn1-modules
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -179,8 +146,6 @@ modules:
 - name: attrs
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -190,8 +155,6 @@ modules:
 - name: service-identity
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -201,8 +164,6 @@ modules:
 - name: incremental
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -212,8 +173,6 @@ modules:
 - name: PyHamcrest
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -223,8 +182,6 @@ modules:
 - name: idna
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -234,8 +191,6 @@ modules:
 - name: hyperlink
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -245,8 +200,6 @@ modules:
 - name: docutils
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -256,8 +209,6 @@ modules:
 - name: mistune
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -267,8 +218,6 @@ modules:
 - name: m2r
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -278,8 +227,6 @@ modules:
 - name: setuptools
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -289,8 +236,6 @@ modules:
 - name: setuptools-scm
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -300,8 +245,6 @@ modules:
 - name: automat
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -311,8 +254,6 @@ modules:
 - name: constantly
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -322,8 +263,6 @@ modules:
 - name: zope.event
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -333,8 +272,6 @@ modules:
 - name: zope.interface
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -344,8 +281,6 @@ modules:
 - name: numpy
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -355,8 +290,6 @@ modules:
 - name: twisted
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -366,8 +299,6 @@ modules:
 - name: pillow
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -377,8 +308,6 @@ modules:
 - name: chardet
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -388,8 +317,6 @@ modules:
 - name: setproctitle
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -399,8 +326,6 @@ modules:
 - name: pyxdg
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -410,8 +335,6 @@ modules:
 - name: MarkupSafe
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -421,8 +344,6 @@ modules:
 - name: mako
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -433,7 +354,6 @@ modules:
   buildsystem: simple
 
   build-commands: 
-  - python3 setup.py build
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -444,7 +364,6 @@ modules:
   buildsystem: simple
 
   build-commands: 
-  - python3 setup.py build
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -456,7 +375,6 @@ modules:
   buildsystem: simple
 
   build-commands: 
-  - python3 setup.py build
   - python3 setup.py install --prefix=/app --root=/
   sources:
   - type: archive
@@ -468,10 +386,7 @@ modules:
 - name: deluge
   buildsystem: simple
   build-commands:
-  - python3 setup.py build
-  - python3 setup.py egg_info
   - python3 setup.py install --prefix=/app --root=/
-  
 
   post-install:
 
@@ -491,4 +406,3 @@ modules:
   - type: file
     path: org.deluge_torrent.deluge.metainfo.xml
     
-