diff --git a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
deleted file mode 100644
index 897828faff819f71c108bbde751598b6b494776f..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Created by mirco on 04.12.15.
- */
-
-package eu.hbp.mip.controllers;
-
-import io.swagger.annotations.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
-
-@RestController
-@RequestMapping(value = "/datasets", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/datasets", description = "the datasets API")
-public class DatasetsApi {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DatasetsApi.class);
-
-
-}
diff --git a/src/main/java/eu/hbp/mip/controllers/JWTApi.java b/src/main/java/eu/hbp/mip/controllers/JWTApi.java
deleted file mode 100644
index a1cb6afd55431bb859170b52c9daa7007ca69c42..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/controllers/JWTApi.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.hbp.mip.controllers;
-
-import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import eu.hbp.mip.model.User;
-import eu.hbp.mip.model.UserInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import eu.hbp.mip.utils.JWTUtil;
-import eu.hbp.mip.utils.UserActionLogging;
-
-@RestController
-@RequestMapping(value = "/jwt", produces = { TEXT_PLAIN_VALUE })
-@Api(value = "/jwt", description = "the jwt API")
-public class JWTApi {
-
-    @Autowired
-    private UserInfo userInfo;
-
-    @Value("#{'${services.workflows.jwtSecret}'}")
-    private String jwtSecret;
-
-    @ApiOperation(value = "Create a JSON Web Token", response = String.class)
-    @RequestMapping(method = RequestMethod.POST)
-    public ResponseEntity<String> createJWT() {
-
-        UserActionLogging.LogAction("Create a JSON Web Token", "");
-
-        User user = userInfo.getUser();
-        String token = JWTUtil.getJWT(jwtSecret, user.getEmail());
-
-        return ResponseEntity.status(HttpStatus.CREATED).body(token);
-    }
-}
diff --git a/src/main/java/eu/hbp/mip/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index c4f9f40bb227a832e5e15dc36f48f30a2ce9d12e..f1a984eca2631c959067f646bcd6336ab56addfe 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -48,9 +48,9 @@ public class MiningApi {
     @Value("#{'${services.exareme.queryExaremeUrl:http://localhost:9090/mining/query}'}")
     public String queryExaremeUrl;
 
-    @ApiOperation(value = "Create an histogram on Exareme", response = String.class)
-    @RequestMapping(value = "/exareme", method = RequestMethod.POST)
-    public ResponseEntity runExaremeMining(@RequestBody List<HashMap<String, String>> queryList) {
+    @ApiOperation(value = "Create a histogram on Exareme", response = String.class)
+    @RequestMapping(value = "/histograms", method = RequestMethod.POST)
+    public ResponseEntity runExaremeHistograms(@RequestBody List<HashMap<String, String>> queryList) {
         UserActionLogging.LogAction("Run an histogram", "");
 
         String query = gson.toJson(queryList);
@@ -66,8 +66,8 @@ public class MiningApi {
         }
     }
 
-    @ApiOperation(value = "Create an descriptive statistic on Exareme", response = String.class)
-    @RequestMapping(value = "/exareme-stats", method = RequestMethod.POST)
+    @ApiOperation(value = "Create a descriptive statistic on Exareme", response = String.class)
+    @RequestMapping(value = "/descriptive_stats", method = RequestMethod.POST)
     public ResponseEntity runExaremeDescriptiveStats(@RequestBody List<HashMap<String, String>> queryList) {
         UserActionLogging.LogAction("Run descriptive stats", "");
 
@@ -83,25 +83,4 @@ public class MiningApi {
             return new ResponseEntity<>("Not found", HttpStatus.BAD_REQUEST);
         }
     }
-
-    @ApiOperation(value = "Perform an non persisted algorithm on Exareme", response = String.class)
-    @RequestMapping(value = "/exareme/{algorithmName}", method = RequestMethod.POST)
-    public ResponseEntity runExaremeAlgorithm(
-        @RequestBody List<HashMap<String, String>> queryList,
-        @ApiParam(value = "algorithmName", required = true) @PathVariable("algorithmName") String algorithmName
-        ) {
-        UserActionLogging.LogAction("Run algo", "");
-
-        String query = gson.toJson(queryList);
-        String url = queryExaremeUrl + "/" + algorithmName;
-
-        try {
-            StringBuilder results = new StringBuilder();
-            int code = HTTPUtil.sendPost(url, query, results);
-
-            return ResponseEntity.ok(gson.toJson(results.toString()));
-        } catch (IOException e) {
-            return new ResponseEntity<>("Not found", HttpStatus.BAD_REQUEST);
-        }
-    }
 }
diff --git a/src/main/java/eu/hbp/mip/helpers/LogHelper.java b/src/main/java/eu/hbp/mip/helpers/LogHelper.java
deleted file mode 100644
index 9fa950c2d48732f87fd0a8ffd946b129032a7ae5..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/helpers/LogHelper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package eu.hbp.mip.helpers;
-
-
-import org.springframework.security.core.userdetails.UserDetails;
-
-public class LogHelper {
-    public static String logUser(UserDetails userDetails){
-        return ("User(subject)->User(" + userDetails.getUsername() + ") : ");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/utils/JWTUtil.java b/src/main/java/eu/hbp/mip/utils/JWTUtil.java
deleted file mode 100644
index 1e74841842150aef10778726040b88a53d14d218..0000000000000000000000000000000000000000
--- a/src/main/java/eu/hbp/mip/utils/JWTUtil.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.hbp.mip.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.JWT;
-
-public class JWTUtil {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JWT.class);
-
-    public static String getJWT(String secret, String subject) {
-        LOGGER.info("getJWT");
-        Algorithm algorithm = Algorithm.HMAC512(secret);
-        String token = JWT.create().withIssuer("mip.humanbrainproject.eu").withSubject(subject).sign(algorithm);
-
-        return token;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/utils/UserActionLogging.java b/src/main/java/eu/hbp/mip/utils/UserActionLogging.java
index f8009127a19580fa34b2f429a928fba936e7d8bb..b4a96fc864a16063c39dede8ea0233fbfd41b981 100644
--- a/src/main/java/eu/hbp/mip/utils/UserActionLogging.java
+++ b/src/main/java/eu/hbp/mip/utils/UserActionLogging.java
@@ -17,7 +17,7 @@ public class UserActionLogging {
                 + " info: " + actionIdInfo);
     }
 
-    // Used from Threads because LogAction won't wor.
+    // Used from Threads because LogAction won't work.
     public static void LogThreadAction(String actionName, String actionIdInfo)
     {
         LOGGER.info( "Thread -->" + actionName + " info: " + actionIdInfo);