diff --git a/pom.xml b/pom.xml
index 4ff45e9551367d5997589cb58af7f29660f0a610..a1e190f3852b6d7adc9c1a973c1b223ea7ce9cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
         <version>2.2.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.example</groupId>
-    <artifactId>demo</artifactId>
+    <groupId>cz.muni.ics.kypo</groupId>
+    <artifactId>kypo2-adaptive-training</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>demo</name>
-    <description>Demo project for Spring Boot</description>
+    <name>KYPO2 Adaptive Training</name>
+    <description>KYPO2 Adaptive Training</description>
 
     <properties>
         <java.version>11</java.version>
 
-        <projectlombok.version>1.18.12</projectlombok.version>
         <org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
+        <swagger.version>2.9.2</swagger.version>
     </properties>
 
     <dependencies>
@@ -49,51 +49,28 @@
             </exclusions>
         </dependency>
 
-        <!--		TODO: just for development purposes-->
-<!--        <dependency>-->
-<!--            <groupId>com.h2database</groupId>-->
-<!--            <artifactId>h2</artifactId>-->
-<!--            <version>1.4.200</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-            <!--			<version>${projectlombok.version}</version>-->
-        </dependency>
-
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
-            <version>1.3.1.Final</version>
-            <!--			<version>${org.mapstruct.version}</version>-->
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
+            <version>${org.mapstruct.version}</version>
         </dependency>
 
         <!-- swagger -->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-            <!--			<version>${swagger.version}</version>-->
+            <version>${swagger.version}</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-            <!--			<version>${swagger.version}</version>-->
+            <version>${swagger.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 49a03c7552d81051dc7a44d55ef8536ee23dd86d..2a9bdbe0de755296c1f4a6216bd8ba9a38e365cc 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -1,44 +1,12 @@
 package com.example.demo;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class DemoApplication {
 
-    private static final Logger log = LoggerFactory.getLogger(DemoApplication.class);
-
     public static void main(String[] args) {
         SpringApplication.run(DemoApplication.class, args);
     }
-
-//    @Bean
-//    CommandLineRunner anotherDemo(GameLevelRepository gameLevelRepository) {
-//        return args -> {
-//
-//            gameLevelRepository.deleteAll();
-//
-//            GameLevel gameLevel = new GameLevel();
-//            gameLevel.setTitle("Title");
-//
-//
-//            GameLevel savedGameLevel = gameLevelRepository.save(gameLevel);
-//            log.info("Saved game level: {}", savedGameLevel);
-//
-//            Optional<GameLevel> foundGameLevel = gameLevelRepository.findById(savedGameLevel.getId());
-//            log.info("Saved game level: {}", foundGameLevel);
-//        };
-//    }
-//
-//    @Bean
-//    CommandLineRunner yetAnotherDemo(GameLevelService gameLevelService) {
-//        return args -> {
-//
-//            List<GameLevelDto> allGameLevels = gameLevelService.findAllGameLevels();
-//            allGameLevels.forEach(gameLevel -> log.info("Found game level with ID {} and title {}", gameLevel.getId(),
-//                                                        gameLevel.getTitle()));
-//        };
-//    }
 }
diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/com/example/demo/service/TaskService.java
index d43baffba03e5739d8fc938d9d33a7c7bb86a09a..ebd1fb431dc74d17ebef7076dd8bc9556bbc2900 100644
--- a/src/main/java/com/example/demo/service/TaskService.java
+++ b/src/main/java/com/example/demo/service/TaskService.java
@@ -8,7 +8,6 @@ import com.example.demo.dto.TaskUpdateDto;
 import com.example.demo.mapper.BeanMapper;
 import com.example.demo.repository.TaskRepository;
 import com.example.demo.repository.TrainingPhaseRepository;
-import org.apache.commons.collections4.IterableUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -16,9 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class TaskService {
 
@@ -84,21 +80,6 @@ public class TaskService {
         return BeanMapper.INSTANCE.toDto(persistedEntity);
     }
 
-    public List<TaskDto> findAllTasks() {
-
-        Iterable<Task> allTasks = taskRepository.findAll();
-
-        List<TaskDto> result = new ArrayList<>();
-
-        if (!IterableUtils.isEmpty(allTasks)) {
-            for (Task task : allTasks) {
-                result.add(BeanMapper.INSTANCE.toDto(task));
-            }
-        }
-
-        return result;
-    }
-
     public TaskDto getTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
         Task task = taskRepository.findById(taskId)
                 .orElseThrow(() -> new RuntimeException("Task was not found"));