diff --git a/src/renku/app/dependencies.cpp b/src/renku/app/dependencies.cpp
--- a/src/renku/app/dependencies.cpp
+++ b/src/renku/app/dependencies.cpp
@@ -23,51 +23,32 @@
 
 #include "dependencies.h"
 
-#include "akonadi/akonadicontextqueries.h"
-#include "akonadi/akonadicontextrepository.h"
 #include "akonadi/akonadidatasourcequeries.h"
 #include "akonadi/akonadidatasourcerepository.h"
 #include "akonadi/akonadinotequeries.h"
 #include "akonadi/akonadinoterepository.h"
-#include "akonadi/akonadiprojectqueries.h"
-#include "akonadi/akonadiprojectrepository.h"
 #include "akonadi/akonaditagqueries.h"
 #include "akonadi/akonaditagrepository.h"
-#include "akonadi/akonaditaskqueries.h"
-#include "akonadi/akonaditaskrepository.h"
 
-#include "akonadi/akonadimessaging.h"
 #include "akonadi/akonadimonitorimpl.h"
 #include "akonadi/akonadiserializer.h"
 #include "akonadi/akonadistorage.h"
 
 #include "presentation/artifacteditormodel.h"
 #include "presentation/availablenotepagesmodel.h"
 #include "presentation/availablesourcesmodel.h"
 
-#include "scripting/scripthandler.h"
-
 #include "utils/dependencymanager.h"
 
 void App::initializeDependencies()
 {
     auto &deps = Utils::DependencyManager::globalInstance();
 
-    deps.add<Akonadi::MessagingInterface, Akonadi::Messaging, Utils::DependencyManager::UniqueInstance>();
     deps.add<Akonadi::MonitorInterface, Akonadi::MonitorImpl, Utils::DependencyManager::UniqueInstance>();
     deps.add<Akonadi::SerializerInterface, Akonadi::Serializer, Utils::DependencyManager::UniqueInstance>();
     deps.add<Akonadi::StorageInterface, Akonadi::Storage, Utils::DependencyManager::UniqueInstance>();
 
 
-    deps.add<Domain::ContextQueries,
-             Akonadi::ContextQueries(Akonadi::StorageInterface*,
-                                     Akonadi::SerializerInterface*,
-                                     Akonadi::MonitorInterface*)>();
-
-    deps.add<Domain::ContextRepository,
-             Akonadi::ContextRepository(Akonadi::StorageInterface*,
-                                        Akonadi::SerializerInterface*)>();
-
     deps.add<Domain::DataSourceQueries>([] (Utils::DependencyManager *deps) {
         return new Akonadi::DataSourceQueries(Akonadi::StorageInterface::Notes,
                                               deps->create<Akonadi::StorageInterface>(),
@@ -88,15 +69,6 @@
              Akonadi::NoteRepository(Akonadi::StorageInterface*,
                                      Akonadi::SerializerInterface*)>();
 
-    deps.add<Domain::ProjectQueries,
-             Akonadi::ProjectQueries(Akonadi::StorageInterface*,
-                                     Akonadi::SerializerInterface*,
-                                     Akonadi::MonitorInterface*)>();
-
-    deps.add<Domain::ProjectRepository,
-             Akonadi::ProjectRepository(Akonadi::StorageInterface*,
-                                        Akonadi::SerializerInterface*)>();
-
     deps.add<Domain::TagQueries,
              Akonadi::TagQueries(Akonadi::StorageInterface*,
                                  Akonadi::SerializerInterface*,
@@ -106,17 +78,6 @@
              Akonadi::TagRepository(Akonadi::StorageInterface*,
                                     Akonadi::SerializerInterface*)>();
 
-    deps.add<Domain::TaskQueries,
-             Akonadi::TaskQueries(Akonadi::StorageInterface*,
-                                  Akonadi::SerializerInterface*,
-                                  Akonadi::MonitorInterface*)>();
-
-    deps.add<Domain::TaskRepository,
-             Akonadi::TaskRepository(Akonadi::StorageInterface*,
-                                     Akonadi::SerializerInterface*,
-                                     Akonadi::MessagingInterface*)>();
-
-
     deps.add<Presentation::ArtifactEditorModel>([] (Utils::DependencyManager *deps) {
         auto model = new Presentation::ArtifactEditorModel;
         auto repository = deps->create<Domain::NoteRepository>();
@@ -137,7 +98,4 @@
     deps.add<Presentation::AvailableSourcesModel,
              Presentation::AvailableSourcesModel(Domain::DataSourceQueries*,
                                                  Domain::DataSourceRepository*)>();
-
-    deps.add<Scripting::ScriptHandler,
-            Scripting::ScriptHandler(Domain::TaskRepository*)>();
 }
diff --git a/src/zanshin/app/dependencies.cpp b/src/zanshin/app/dependencies.cpp
--- a/src/zanshin/app/dependencies.cpp
+++ b/src/zanshin/app/dependencies.cpp
@@ -27,12 +27,8 @@
 #include "akonadi/akonadicontextrepository.h"
 #include "akonadi/akonadidatasourcequeries.h"
 #include "akonadi/akonadidatasourcerepository.h"
-#include "akonadi/akonadinotequeries.h"
-#include "akonadi/akonadinoterepository.h"
 #include "akonadi/akonadiprojectqueries.h"
 #include "akonadi/akonadiprojectrepository.h"
-#include "akonadi/akonaditagqueries.h"
-#include "akonadi/akonaditagrepository.h"
 #include "akonadi/akonaditaskqueries.h"
 #include "akonadi/akonaditaskrepository.h"
 
@@ -45,8 +41,6 @@
 #include "presentation/availablesourcesmodel.h"
 #include "presentation/availabletaskpagesmodel.h"
 
-#include "scripting/scripthandler.h"
-
 #include "utils/dependencymanager.h"
 
 void App::initializeDependencies()
@@ -79,15 +73,6 @@
              Akonadi::DataSourceRepository(Akonadi::StorageInterface*,
                                            Akonadi::SerializerInterface*)>();
 
-    deps.add<Domain::NoteQueries,
-             Akonadi::NoteQueries(Akonadi::StorageInterface*,
-                                  Akonadi::SerializerInterface*,
-                                  Akonadi::MonitorInterface*)>();
-
-    deps.add<Domain::NoteRepository,
-             Akonadi::NoteRepository(Akonadi::StorageInterface*,
-                                     Akonadi::SerializerInterface*)>();
-
     deps.add<Domain::ProjectQueries,
              Akonadi::ProjectQueries(Akonadi::StorageInterface*,
                                      Akonadi::SerializerInterface*,
@@ -97,15 +82,6 @@
              Akonadi::ProjectRepository(Akonadi::StorageInterface*,
                                         Akonadi::SerializerInterface*)>();
 
-    deps.add<Domain::TagQueries,
-             Akonadi::TagQueries(Akonadi::StorageInterface*,
-                                 Akonadi::SerializerInterface*,
-                                 Akonadi::MonitorInterface*)>();
-
-    deps.add<Domain::TagRepository,
-             Akonadi::TagRepository(Akonadi::StorageInterface*,
-                                    Akonadi::SerializerInterface*)>();
-
     deps.add<Domain::TaskQueries,
              Akonadi::TaskQueries(Akonadi::StorageInterface*,
                                   Akonadi::SerializerInterface*,
@@ -141,7 +117,4 @@
     deps.add<Presentation::AvailableSourcesModel,
              Presentation::AvailableSourcesModel(Domain::DataSourceQueries*,
                                                  Domain::DataSourceRepository*)>();
-
-    deps.add<Scripting::ScriptHandler,
-            Scripting::ScriptHandler(Domain::TaskRepository*)>();
 }