diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index 7975975d8f6df808357b29b913e8681b1e87b2c9..e79f77496c73b4dc22bd05da0edd6f798eac0b10 100644
--- a/src/main/java/de/thm/arsnova/controller/CourseController.java
+++ b/src/main/java/de/thm/arsnova/controller/CourseController.java
@@ -48,7 +48,6 @@ import de.thm.arsnova.services.IUserService;
  * Provides access to a user's courses in an LMS such as Moodle.
  */
 @RestController
-@Api(value = "/course", description = "the Course API")
 public class CourseController extends AbstractController {
 
 	public static final Logger LOGGER = LoggerFactory.getLogger(CourseController.class);
@@ -59,11 +58,6 @@ public class CourseController extends AbstractController {
 	@Autowired
 	private IUserService userService;
 
-	@ApiOperation(value = "retrieves a User Courses",
-			nickname = "myCourses")
-	@ApiResponses(value = {
-		@ApiResponse(code = 200, message = HTML_STATUS_200)
-	})
 	@RequestMapping(value = "/mycourses", method = RequestMethod.GET)
 	public List<Course> myCourses(
 			@ApiParam(value="sort my courses by name", required=true)
diff --git a/src/main/java/de/thm/arsnova/controller/FeedbackController.java b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
index 91280b70b57bb277becdb3697491c1146159436e..98827df3cec5ba9b08236b41d1f5a8e3f91ecc14 100644
--- a/src/main/java/de/thm/arsnova/controller/FeedbackController.java
+++ b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
@@ -47,7 +47,6 @@ import de.thm.arsnova.web.DeprecatedApi;
  * @see de.thm.arsnova.socket.ARSnovaSocketIOServer
  */
 @RestController
-@Api(value = "/feedback", description = "the deprecated Feedback API")
 public class FeedbackController extends AbstractController {
 
 	public static final Logger LOGGER = LoggerFactory.getLogger(FeedbackController.class);
@@ -58,8 +57,6 @@ public class FeedbackController extends AbstractController {
 	@Autowired
 	private IUserService userService;
 
-	@ApiOperation(value = "Get feedback from a session",
-			nickname = "getFeedback")
 	@DeprecatedApi
 	@Deprecated
 	@RequestMapping(value = "/session/{sessionkey}/feedback", method = RequestMethod.GET)
@@ -67,11 +64,6 @@ public class FeedbackController extends AbstractController {
 		return feedbackService.getFeedback(sessionkey);
 	}
 
-	@ApiOperation(value = "Get own feedback from a session",
-			nickname = "getMyFeedback")
-	@ApiResponses(value = {
-		@ApiResponse(code = 404, message = HTML_STATUS_404)
-	})
 	@DeprecatedApi
 	@Deprecated
 	@RequestMapping(value = "/session/{sessionkey}/myfeedback", method = RequestMethod.GET)
@@ -83,8 +75,6 @@ public class FeedbackController extends AbstractController {
 		throw new NotFoundException();
 	}
 
-	@ApiOperation(value = "Get amout of feedback from a session",
-			nickname = "getFeedbackCount")
 	@DeprecatedApi
 	@Deprecated
 	@RequestMapping(value = "/session/{sessionkey}/feedbackcount", method = RequestMethod.GET)
@@ -92,8 +82,6 @@ public class FeedbackController extends AbstractController {
 		return feedbackService.getFeedbackCount(sessionkey);
 	}
 
-	@ApiOperation(value = "Get the average feedback (rounded) from a session",
-			nickname = "getAverageFeedbackRounded")
 	@DeprecatedApi
 	@Deprecated
 	@RequestMapping(value = "/session/{sessionkey}/roundedaveragefeedback", method = RequestMethod.GET)
@@ -108,11 +96,6 @@ public class FeedbackController extends AbstractController {
 		return feedbackService.getAverageFeedback(sessionkey);
 	}
 
-	@ApiOperation(value = "Post feedback for a session",
-			nickname = "postFeedback")
-	@ApiResponses(value = {
-		@ApiResponse(code = 404, message = HTML_STATUS_404)
-	})
 	@DeprecatedApi
 	@Deprecated
 	@RequestMapping(value = "/session/{sessionkey}/feedback", method = RequestMethod.POST)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index a63e6cff5216ef22d3a54d436061af6f25397449..fe8fcedc0b220198e75a9b62ce77bbaf61f460d7 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -616,11 +616,6 @@ public class LecturerQuestionController extends PaginationController {
 		}
 	}
 
-	@ApiOperation(value = "Set the sort order of the subjects from a session, identified by the sessionkey",
-			nickname = "setSubjectSortOrder")
-	@ApiResponses(value = {
-		@ApiResponse(code = 400, message = HTML_STATUS_400)
-	})
 	@RequestMapping(value = "/subjectsort", method = RequestMethod.POST)
 	public void setSubjectSortOrder(
 			@RequestParam(required = true) final String sessionkey,
@@ -635,8 +630,6 @@ public class LecturerQuestionController extends PaginationController {
 		}
 	}
 
-	@ApiOperation(value = "Get the sort order of the subjects from a session, identified by the sessionkey",
-			nickname = "getSubjectSortType")
 	@RequestMapping(value = "/subjectsort", method = RequestMethod.GET)
 	public String getSubjectSortType(
 			@RequestParam(required = true) final String sessionkey,
@@ -645,11 +638,6 @@ public class LecturerQuestionController extends PaginationController {
 		return questionService.getSubjectSortType(sessionkey, ispreparation);
 	}
 
-	@ApiOperation(value = "Set the sort order of the questions from a subject in a session, identified by the sessionkey",
-			nickname = "setQuestionSortOrder")
-	@ApiResponses(value = {
-		@ApiResponse(code = 400, message = HTML_STATUS_400)
-	})
 	@RequestMapping(value = "/questionsort", method = RequestMethod.POST)
 	public void setQuestionSortOrder(
 			@RequestParam(required = true) final String sessionkey,
@@ -664,12 +652,7 @@ public class LecturerQuestionController extends PaginationController {
 			throw new BadRequestException();
 		}
 	}
-
-	@ApiOperation(value = "Get the sort order of the questions from a subject in a session, identified by the sessionkey",
-			nickname = "getQuestionSortType")
-	@ApiResponses(value = {
-		@ApiResponse(code = 204, message = HTML_STATUS_204)
-	})
+    
 	@RequestMapping(value = "/questionsort", method = RequestMethod.GET)
 	public String getQuestionSortType(
 			@RequestParam(required = true) final String sessionkey,
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 63eb9dd43dd77d5eb98b13e57472abcc729adcf6..5ad96b29553562a7a563777ffaa2267d2b64c712 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -74,8 +74,10 @@ public class SessionController extends PaginationController {
 	@Autowired
 	private IUserService userService;
 
-	@ApiOperation(value = "Count all the questions in current session",
+	@ApiOperation(value = "join a session",
 			nickname = "joinSession")
+	@DeprecatedApi
+	@Deprecated
 	@RequestMapping(value = "/{sessionkey}", method = RequestMethod.GET)
 	public Session joinSession(@ApiParam(value = "Session-Key from current session", required = true) @PathVariable final String sessionkey) {
 		return Session.anonymizedCopy(sessionService.getSession(sessionkey));
@@ -222,7 +224,7 @@ public class SessionController extends PaginationController {
 	}
 
 	@ApiOperation(value = "Retrieves all public pool sessions for the current user",
-			nickname = "getMyPublicPoolSessions")
+			nickname = "getMyPublicPoolSessions", response = Session.class, responseContainer = "List")
 	@ApiResponses(value = {
 		@ApiResponse(code = 204, message = HTML_STATUS_204)
 	})