diff --git a/custom-qt5-libs-build-include b/custom-qt5-libs-build-include
index 7ba5eb4..c6ca09b 100644
--- a/custom-qt5-libs-build-include
+++ b/custom-qt5-libs-build-include
@@ -1,59 +1,46 @@
 # These libs are likely part of your distro
 
 # So you only need to include this file if you compile your own Qt5,
 # to avoid mixing your own Qt with the distro's Qt.
 
 # For okular
 
 module poppler
   repository git://git.freedesktop.org/git/poppler/poppler
   branch master
   cmake-options -DWITH_GLIB=OFF -DLIB_SUFFIX=64 -DENABLE_UNSTABLE_API_ABI_HEADERS=1
 end module
 
 # For kaccounts-integration
 
 module libaccounts-glib
   # doesn't depend on qt, but this way it's the right version for libaccounts-qt below
   repository https://gitlab.com/accounts-sso/libaccounts-glib.git
   configure-flags --disable-man
 end module
 
 module libaccounts-qt
   repository https://gitlab.com/accounts-sso/libaccounts-qt.git
   qmake-options PREFIX=${kdedir}
 end module
 
 module signond
   repository https://gitlab.com/accounts-sso/signond.git
   qmake-options PREFIX=${kdedir}
 end module
 
 # For telepathy-accounts-signon
 
 module libsignon-glib
   # this one does depend on qt, it seems
   repository https://gitlab.com/accounts-sso/libsignon-glib.git
   qmake-options PREFIX=${kdedir}
 end module
 
 # Mandatory for kmouth, optional for kpimtextedit
 
 module qtspeech
   repository git://code.qt.io/qt/qtspeech.git
   branch dev
 end module
 
-# For simon
-
-module sphinxbase
-  repository https://github.com/cmusphinx/sphinxbase.git
-end module
-
-module qwt6
-  override-url svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.2
-  # The qwt6 build system is very unflexible.
-  # For this to work you need to comment out all lines setting QWT_INSTALL_PREFIX in qwtconfig.pri...
-  qmake-options QWT_INSTALL_PREFIX=${kdedir}
-end module
-
diff --git a/kf5-applications-build-include b/kf5-applications-build-include
index a8f02be..1b9490d 100644
--- a/kf5-applications-build-include
+++ b/kf5-applications-build-include
@@ -1,174 +1,174 @@
 # Module definitions for building KDE Applications 5
 
 # Usage: Write your own kdesrc-buildrc with only a "global" section
 # (including "branch-group kf5-qt5")
 # then include this file, like this:
 #
 # include extragear/utils/kdesrc-build/kf5-frameworks-build-include
 # include extragear/utils/kdesrc-build/kf5-applications-build-include
 # (or using full paths)
 #
 # You can then add additional modules if desired.
 #
 # This file uses "branch groups" to decide which git branch to use. If you
 # want to add your application here please be sure to update
 # kde-build-metadata repo's "logical-module-structure". It includes a simple
 # tool you can use to validate your change works (or just "kdesrc-build -p
 # your-module" and look for the right branch).
 
 module-set kf5-base-applications
     repository kde-projects
     use-modules konsole kate dolphin keditbookmarks kfind konqueror kdialog kio-extras khelpcenter
 end module-set
 
 module-set kdegraphics
     repository kde-projects
     use-modules kdegraphics/*
 end module-set
 
 module-set kdevelop-kf5
     repository kde-projects
 
     # The foo.git syntax forces kdesrc-build to use matching git repositories
     # even when the module name "foo" would also match a whole group of modules
     # (you can use kdevelop/* if you wanted the group of modules instead).
     use-modules kdevelop.git
 end module-set
 
 module-set kile
     repository kde-projects
     use-modules kile
 end module-set
 
 module-set kf5-scanner
     repository kde-projects
     use-modules libksane skanlite
 end module-set
 
 module-set kf5-utils
     repository kde-projects
     use-modules libkomparediff2 kcachegrind okteta lokalize yakuake
 end module-set
 
 module-set kdeedu
     repository kde-projects
     use-modules libkeduvocdocument \
         kdeedu-data \
         analitza \
         artikulate \
         blinken \
         cantor \
         kalgebra \
         kalzium \
         kanagram \
         kbruch \
         kgeography \
         khangman \
         kig \
         kiten \
         klettres \
         kmplot \
         kstars \
         kqtquickcharts \
         ktouch \
         kturtle \
         kwordquiz \
         marble \
         minuet \
         parley \
         rocs \
         step
 end module-set
 
 module-set kdeaccessibility
     repository kde-projects
-    use-modules kmag kmouth kmousetool simon
+    use-modules kmag kmouth kmousetool
 end module-set
 
 module telepathy-qt
     repository git://anongit.freedesktop.org/git/telepathy/telepathy-qt.git
     cmake-options -DDESIRED_QT_VERSION=5
 end module
 
 module-set ktp
     repository kde-projects
     use-modules ktp-common-internals ktp-desktop-applets ktp-contact-list \
                 ktp-kded-module ktp-send-file ktp-text-ui ktp-filetransfer-handler \
                 ktp-accounts-kcm ktp-auth-handler \
                 kaccounts-providers kaccounts-integration signon-kwallet-extension
     branch master
 end module-set
 
 module-set kdenetwork
     repository kde-projects
     use-modules krfb krdc kget
 end module-set
 
 module telepathy-accounts-signon
     repository https://gitlab.com/accounts-sso/telepathy-accounts-signon.git
     branch master
 end module
 
 module-set konversation
     repository kde-projects
     use-modules konversation
 end module-set
 
 module-set kdeutils
     repository kde-projects
     use-modules kdeutils/*
 end module-set
 
 module-set kdemultimedia
     repository kde-projects
     use-modules kdemultimedia/*
 end module-set
 
 module-set kdeadmin
     repository kde-projects
     use-modules kdeadmin/*
 end module-set
 
 module-set kmix
     repository kde-projects
     use-modules kmix
     cmake-options -DKMIX_KF5_BUILD:STRING=TRUE
 end module-set
 
 module-set plasma-mediacenter
     repository kde-projects
     use-modules plasma-mediacenter
 end module-set
 
 module-set kdegames
     repository kde-projects
     use-modules kde/kdegames # Will automatically pull in all modules
 end module-set
 
 module-set kdewebdev
     repository kde-projects
     use-modules kimagemapeditor
 end module-set
 
 module-set kdeconnect
     repository kde-projects
     use-modules kdeconnect-kde
 end module-set
 
 module-set calligra-libs
     repository kde-projects
     use-modules kdiagram kdb kproperty kreport
 end module-set
 
 module-set calligra
     repository kde-projects
     # The foo.git syntax forces kdesrc-build to use matching git repositories
     # even when the module name "foo" would also match a whole group of modules
     use-modules calligra.git kexi calligraplan
 end module-set
 
 module-set krita
     repository kde-projects
     use-modules krita
 end module-set