diff --git a/src/main/java/eu/hbp/mip/akka/ListeningService.java b/src/main/java/eu/hbp/mip/akka/ListeningService.java
deleted file mode 100644
index 49d673d9d1851b9f3df1d6002e0a7b7280a62bf9..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/akka/ListeningService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package eu.hbp.mip.akka;
-
-import javax.inject.Named;
-
-/**
- * Created by mirco on 24.10.16.
- */
-
-@Named("ListeningService")
-public class ListeningService {
-    public void listen(String result) {
-        System.out.println(result);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index 1ee3b19624d3b119aabf1870789d091bc5174da8..5e104a2da528f010dd6705edc9b21052b35b41fd 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -15,18 +15,14 @@ import static eu.hbp.mip.akka.SpringExtension.SpringExtProvider;
 @Configuration
 class AkkaConfiguration {
 
-    // the application context is needed to initialize the Akka Spring Extension
     @Autowired
     private ApplicationContext applicationContext;
 
-    /**
-     * Actor system singleton for this application.
-     */
     @Bean
     public ActorSystem actorSystem() {
-        ActorSystem system = ActorSystem.create("AkkaJavaSpring");
-        // initialize the application context in the Akka Spring Extension
+        ActorSystem system = ActorSystem.create("AkkaActorSystem");
         SpringExtProvider.get(system).initialize(applicationContext);
         return system;
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index 4932a2add54f6564d7914dca636faa4f6c7b2135..b9639f2cc836af357637bbb2e4474c5bb5fe2121 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -7,8 +7,6 @@ import akka.actor.Props;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import eu.hbp.mip.akka.ExperimentActor;
 import eu.hbp.mip.akka.SimpleActor;
 import eu.hbp.mip.configuration.SecurityConfiguration;
@@ -25,6 +23,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -80,6 +79,9 @@ public class ExperimentApi {
     @Autowired
     private ActorSystem actorSystem;
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
     @Value("#{'${akka.woken-path:akka.tcp://woken@127.0.0.1:8088/user/entrypoint}'}")
     private String wokenPath;
 
@@ -211,7 +213,7 @@ public class ExperimentApi {
     @ApiOperation(value = "List available methods and validations", response = String.class)
     @Cacheable("methods")
     @RequestMapping(path = "/methods", method = RequestMethod.GET)
-    public ResponseEntity<String> listAvailableMethodsAndValidations() throws IOException {
+    public ResponseEntity listAvailableMethodsAndValidations() throws IOException {
         LOGGER.info("List available methods and validations");
 
         StringBuilder response = new StringBuilder();
@@ -220,19 +222,7 @@ public class ExperimentApi {
         ActorRef simpleActor = actorSystem.actorOf(Props.create(SimpleActor.class));
         wokenActor.tell(new MethodsQuery(), simpleActor);
 
-
-        // TODO: remove this
-        int code = 200;
-        JsonObject catalog = new JsonParser().parse(response.toString()).getAsJsonObject();
-//
-//        InputStream is = ExperimentApi.class.getClassLoader().getResourceAsStream(EXAREME_ALGO_JSON_FILE);
-//        InputStreamReader isr = new InputStreamReader(is);
-//        BufferedReader br = new BufferedReader(isr);
-//        JsonObject exaremeAlgo = new JsonParser().parse(br).getAsJsonObject();
-//
-//        catalog.get("algorithms").getAsJsonArray().add(exaremeAlgo);
-//
-        return new ResponseEntity<>(gson.toJson(catalog), HttpStatus.valueOf(code));
+        return ResponseEntity.ok().build();
     }
 
     private ResponseEntity<String> doListExperiments(