diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java
index d1eeba8b0e11d735fd939dea331037f6f8b5f0ee..696c370354ea121b8f76fff0fc02773a0378f63d 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java
@@ -76,11 +76,4 @@ public class AnswerController {
             return ResponseEntity.notFound().build();
         }
     }
-
-//    @TestOnly
-    @DeleteMapping("/reset")
-    public void resetTable() {
-        facade.resetTable();
-    }
-
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
index 99022c65f0c2b0a9b5b2066cb8ca8f7e224971cd..5f885b00b11525ecd2cfb0ddbbffe43a0f40f071 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
@@ -47,9 +47,4 @@ public class AnswerFacade {
     public void delete(long id) {
         answerService.delete(id);
     }
-
-    public void resetTable() {
-        answerService.reset();
-        answerService.resetId();
-    }
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java
index f722165117de22968c9fb25690dc77fe51d3f5ac..8d0844a898915658d73220923586a5630ac351a7 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java
@@ -1,11 +1,8 @@
 package org.fuseri.moduleexercise.answer;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,9 +19,4 @@ public interface AnswerRepository extends JpaRepository<Answer, Long> {
      * @return a list of all answers to the specified question
      */
     List<Answer> findByQuestionId(@Param("questionId") long questionId);
-
-    @Transactional
-    @Modifying
-    @Query( value = "ALTER TABLE Answer ALTER COLUMN id RESTART WITH 1",nativeQuery = true)
-    void reserId();
 }
\ No newline at end of file
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java
index f7883456a055fab400e6258a1548bd6bc327dd5e..f5346fc5993874b4de7ca7d49fe39ba8c17ee6ba 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java
@@ -58,8 +58,4 @@ public class AnswerService extends DomainService<Answer> {
         return repository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Answer '" + id + "' not found."));
     }
-
-    public void resetId() {
-        repository.reserId();
-    }
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java
index ee083a04770e021365bd3565897bde39b265d7f8..e0824dae22c74ed937ed4a1cbda4dda48a16b912 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java
@@ -55,8 +55,4 @@ public abstract class DomainService<T extends DomainObject> {
         getRepository().deleteById(id);
     }
 
-    public void reset() {
-        getRepository().deleteAll();
-//        getRepository().id/
-    }
 }
\ No newline at end of file
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java
index 607b3814f604dcdfee01541f7a4a6d752784416f..96f91fc77b92040b231cc51218ff393a26184530 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java
@@ -181,10 +181,4 @@ public class ExerciseController {
         return ResponseEntity.noContent().build();
     }
 
-//    @TestOnly
-    @DeleteMapping("/reset")
-    public void resetTable() {
-        facade.resetTable();
-    }
-
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
index 35cea2f61c3bf72d6c94266cfb369eb0e0c70fcc..3134fadf5997e659f224d894f775c1df19e1ec90 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
@@ -118,8 +118,4 @@ public class ExerciseFacade {
         exerciseService.delete(id);
     }
 
-    public void resetTable() {
-        exerciseService.reset();
-        exerciseService.resetId();
-    }
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java
index 02cbc047a790b6dcad94a4a88157e2c0bb850e9c..a2ff556892065d2be6b365566bf3bac9a6e0a504 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java
@@ -5,11 +5,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * A repository interface for managing Exercise entities
@@ -33,11 +31,4 @@ public interface ExerciseRepository extends JpaRepository<Exercise, Long> {
     @Query("SELECT q FROM Exercise e JOIN e.questions q WHERE e.id = :exerciseId")
     Page<Question> getQuestions(PageRequest pageRequest, @Param("exerciseId") Long exerciseId);
 
-
-    @Modifying
-    @Transactional
-    @Query( value = "ALTER TABLE Exercise ALTER COLUMN id RESTART WITH 1",nativeQuery = true)
-    void resetId();
-
-
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java
index 0caf8b0d14a100701416d872e7f78fa104237620..41aa3c7e68a9c05b82fe0634d17c481525451d7c 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java
@@ -85,8 +85,4 @@ public class ExerciseService extends DomainService<Exercise> {
                 exerciseId);
     }
 
-    @Transactional
-    public void resetId() {
-        repository.resetId();
-    }
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
index d25c06dbe6f0a05c61eae2f89fe2467aa14e6625..8fe1e2a19f4fd2663aa3a22e0e5f9848829f8800 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
@@ -96,15 +96,4 @@ public class QuestionFacade {
     public void delete(long id) {
         questionService.delete(id);
     }
-
-    //@TestOnly
-    public void reset() {
-        questionService.reset();
-        questionService.resetId();
-    }
-
-    public void resetTable() {
-        questionService.reset();
-        questionService.resetId();
-    }
 }
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java
index 0c11e6ecb29d9e026066678822213adef314d1c1..b5b2adc4d3208451e1d1789654def49121feb14f 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java
@@ -1,21 +1,11 @@
 package org.fuseri.moduleexercise.question;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * A repository interface for managing Question entities
  */
 @Repository
 public interface QuestionRepository extends JpaRepository<Question, Long> {
-
-    //@TestOnly
-    @Modifying
-    @Transactional
-    @Query( value = "ALTER TABLE Question ALTER COLUMN id RESTART WITH 1",nativeQuery = true)
-    void resetId();
-
 }
\ No newline at end of file