diff --git a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
deleted file mode 100644
index abd82427569fbc6fde2559989f9785c8bc79502b..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.thm.arsnova.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import de.thm.arsnova.entities.FoodVote;
-import de.thm.arsnova.services.IFoodService;
-
-@RestController
-@RequestMapping("/canteen/menu/vote")
-public class FoodVoteController extends AbstractController {
-
-	public static final Logger LOGGER = LoggerFactory.getLogger(FoodVoteController.class);
-
-	@Autowired
-	private IFoodService foodService;
-
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public final void setFoodVote(
-			@RequestBody final Object menu,
-			final HttpServletResponse response
-			) {
-		final String menustring = JSONObject.fromObject(menu).getString("menu");
-		foodService.vote(menustring);
-	}
-
-	@RequestMapping(value = "/", method = RequestMethod.GET)
-	public final List<FoodVote> getFoodVote() {
-		return foodService.getFoodVote();
-	}
-
-	@RequestMapping(value = "/count", method = RequestMethod.GET, produces = "text/plain")
-	public final String getFoodVoteCount() {
-		return Integer.toString(foodService.getFoodVoteCount());
-	}
-}
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 5e8f03fa8d5ce011e6ea3f6807bec97bcac12c75..b54df6d521021fbedeae70ec5365538e732246bf 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import de.thm.arsnova.connector.model.Course;
-import de.thm.arsnova.entities.LoggedIn;
 import de.thm.arsnova.entities.Session;
 import de.thm.arsnova.exceptions.UnauthorizedException;
 import de.thm.arsnova.services.ISessionService;
@@ -65,7 +64,7 @@ public class SessionController extends AbstractController {
 
 	@RequestMapping(value = "/{sessionkey}", method = RequestMethod.GET)
 	public final Session joinSession(@PathVariable final String sessionkey) {
-		final Session session = sessionService.joinSession(sessionkey);
+		final Session session = sessionService.getSession(sessionkey);
 		if (! session.getCreator().equals(userService.getCurrentUser().getUsername())) {
 			session.setCreator("NOT VISIBLE TO YOU");
 		} else {
@@ -79,13 +78,6 @@ public class SessionController extends AbstractController {
 		sessionService.deleteSession(sessionkey);
 	}
 
-	@DeprecatedApi
-	@RequestMapping(value = "/{sessionkey}/online", method = RequestMethod.POST)
-	@ResponseStatus(HttpStatus.CREATED)
-	public final LoggedIn registerAsOnlineUser(@PathVariable final String sessionkey) {
-		return sessionService.registerAsOnlineUser(sessionkey);
-	}
-
 	@DeprecatedApi
 	@RequestMapping(value = "/{sessionkey}/activeusercount", method = RequestMethod.GET)
 	public final int countActiveUsers(@PathVariable final String sessionkey) {
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 6ca6d68ca688f3e5aaee35900ad6d343303c1436..3c80c5832441073a4cc1708d76a907162273de08 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -53,7 +53,6 @@ import com.fourspaces.couchdb.ViewResults;
 import de.thm.arsnova.connector.model.Course;
 import de.thm.arsnova.entities.Answer;
 import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.FoodVote;
 import de.thm.arsnova.entities.InterposedQuestion;
 import de.thm.arsnova.entities.InterposedReadingCount;
 import de.thm.arsnova.entities.LoggedIn;
@@ -772,39 +771,6 @@ public class CouchDBDao implements IDatabaseDao {
 		}
 	}
 
-	@Override
-	public List<FoodVote> getFoodVote() {
-		final List<FoodVote> foodVotes = new ArrayList<FoodVote>();
-		final String date = new SimpleDateFormat("dd-mm-yyyyy").format(new Date());
-		final NovaView view = new NovaView("food_vote/count_by_day");
-		view.setStartKeyArray(date);
-		view.setEndKeyArray(date, "{}");
-		view.setGroup(true);
-		final ViewResults results = getDatabase().view(view);
-		for (final Document d : results.getResults()) {
-			final FoodVote vote = new FoodVote();
-			vote.setCount(d.getJSONObject().optInt("value"));
-			vote.setDay(date);
-			vote.setName(d.getJSONObject().getJSONArray("key").getString(1));
-			foodVotes.add(vote);
-		}
-		return foodVotes;
-	}
-
-	@Override
-	public int getFoodVoteCount() {
-		final String date = new SimpleDateFormat("dd-mm-yyyyy").format(new Date());
-		final NovaView view = new NovaView("food_vote/count_by_day");
-		view.setStartKeyArray(date);
-		view.setEndKeyArray(date, "{}");
-		view.setGroup(false);
-		final ViewResults results = getDatabase().view(view);
-		if (results.size() == 0 || results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
 	@Override
 	public int countSessions() {
 		return sessionsCountValue("openSessions")
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 67eaeaede0dd6e5c367b0d2465a56cd72a2cf73b..70b76c55f4c988017e751a8f777b62662a521385 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -25,7 +25,6 @@ import java.util.List;
 import de.thm.arsnova.connector.model.Course;
 import de.thm.arsnova.entities.Answer;
 import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.FoodVote;
 import de.thm.arsnova.entities.InterposedQuestion;
 import de.thm.arsnova.entities.InterposedReadingCount;
 import de.thm.arsnova.entities.LoggedIn;
@@ -88,10 +87,6 @@ public interface IDatabaseDao {
 
 	void vote(User me, String menu);
 
-	int getFoodVoteCount();
-
-	List<FoodVote> getFoodVote();
-
 	int countSessions();
 
 	int countOpenSessions();
diff --git a/src/main/java/de/thm/arsnova/entities/FoodVote.java b/src/main/java/de/thm/arsnova/entities/FoodVote.java
deleted file mode 100644
index feac308ddb5cd230b7730e52953459900ac10beb..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/entities/FoodVote.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package de.thm.arsnova.entities;
-
-public class FoodVote {
-	private String _id;
-	private String _rev;
-	private String type;
-	private String name;
-	private int count;
-	private String day;
-
-	public FoodVote() {
-		this.type = "food_vote";
-	}
-
-	public String get_id() {
-		return _id;
-	}
-
-	public void set_id(String _id) {
-		this._id = _id;
-	}
-
-	public String get_rev() {
-		return _rev;
-	}
-
-	public void set_rev(String _rev) {
-		this._rev = _rev;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getCount() {
-		return count;
-	}
-
-	public void setCount(int count) {
-		this.count = count;
-	}
-
-	public String getDay() {
-		return day;
-	}
-
-	public void setDay(String day) {
-		this.day = day;
-	}
-}
diff --git a/src/main/java/de/thm/arsnova/services/FoodService.java b/src/main/java/de/thm/arsnova/services/FoodService.java
deleted file mode 100644
index e8d6ac01915e7ab8b311e0cc9b4e18308dd4b346..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/services/FoodService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.services;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Service;
-
-import de.thm.arsnova.dao.IDatabaseDao;
-import de.thm.arsnova.entities.FoodVote;
-
-@Service
-public class FoodService implements IFoodService {
-
-	@Autowired
-	private IDatabaseDao databaseDao;
-
-	@Autowired
-	private IUserService userService;
-
-	public final void setDatabaseDao(IDatabaseDao databaseDao) {
-		this.databaseDao = databaseDao;
-	}
-
-	@Override
-	@PreAuthorize("isAuthenticated()")
-	public void vote(String menu) {
-		this.databaseDao.vote(userService.getCurrentUser(), menu);
-
-	}
-
-	@Override
-	public List<FoodVote> getFoodVote() {
-		return this.databaseDao.getFoodVote();
-	}
-
-	@Override
-	public int getFoodVoteCount() {
-		return this.databaseDao.getFoodVoteCount();
-	}
-}
diff --git a/src/main/java/de/thm/arsnova/services/IFoodService.java b/src/main/java/de/thm/arsnova/services/IFoodService.java
deleted file mode 100644
index dbd2c1fce2f8253c9dc9f57336489c3829a17b89..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/services/IFoodService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.services;
-
-import java.util.List;
-
-import de.thm.arsnova.entities.FoodVote;
-
-public interface IFoodService {
-
-	void vote(String menu);
-
-	int getFoodVoteCount();
-
-	List<FoodVote> getFoodVote();
-
-}
diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java
index 20e40d828d1b5958df5b0ed50935b496f5853fd3..16faadd4a2c037de8a3a74952fc4f80d38aa20c9 100644
--- a/src/main/java/de/thm/arsnova/services/ISessionService.java
+++ b/src/main/java/de/thm/arsnova/services/ISessionService.java
@@ -28,7 +28,7 @@ import de.thm.arsnova.entities.LoggedIn;
 import de.thm.arsnova.entities.Session;
 
 public interface ISessionService {
-	Session joinSession(String keyword);
+	Session getSession(String keyword);
 
 	Session saveSession(Session session);
 
@@ -40,8 +40,6 @@ public interface ISessionService {
 
 	List<Session> getMyVisitedSessions();
 
-	LoggedIn registerAsOnlineUser(String sessionkey);
-
 	int countSessions(List<Course> courses);
 
 	int activeUsers(String sessionkey);
diff --git a/src/main/java/de/thm/arsnova/services/IUserService.java b/src/main/java/de/thm/arsnova/services/IUserService.java
index ee4258519f9b674dd2fd7159384ccd9e3d5710cf..071411e9a85e1ba02f22e78783b2db4b1d73db4d 100644
--- a/src/main/java/de/thm/arsnova/services/IUserService.java
+++ b/src/main/java/de/thm/arsnova/services/IUserService.java
@@ -45,8 +45,6 @@ public interface IUserService {
 
 	Set<User> getUsersInSession(String keyword);
 
-	void addCurrentUserToSessionMap(String keyword);
-
 	String getSessionForUser(String username);
 
 	void addUserToSessionBySocketId(UUID socketId, String keyword);
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index d2742c182e907e67e451b35661d7baa360b378c7..a00c4e448ca1776c9e297cb312630e50ee1aab5c 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service;
 import de.thm.arsnova.connector.client.ConnectorClient;
 import de.thm.arsnova.connector.model.Course;
 import de.thm.arsnova.dao.IDatabaseDao;
-import de.thm.arsnova.entities.LoggedIn;
 import de.thm.arsnova.entities.Question;
 import de.thm.arsnova.entities.Session;
 import de.thm.arsnova.entities.User;
@@ -116,9 +115,7 @@ public class SessionService implements ISessionService {
 
 	@Override
 	@PreAuthorize("isAuthenticated()")
-	public final Session joinSession(final String keyword) {
-		/* HTTP polling solution (legacy) */
-
+	public final Session getSession(final String keyword) {
 		final User user = userService.getCurrentUser();
 		final Session session = databaseDao.getSessionFromKeyword(keyword);
 		if (session == null) {
@@ -132,10 +129,6 @@ public class SessionService implements ISessionService {
 			}
 		}
 
-		userService.addCurrentUserToSessionMap(keyword);
-		socketIoServer.reportActiveUserCountForSession(keyword);
-		socketIoServer.reportFeedbackForUserInSession(session, userService.getCurrentUser());
-
 		if (connectorClient != null && session.isCourseSession()) {
 			final String courseid = session.getCourseId();
 			if (!connectorClient.getMembership(userService.getCurrentUser().getUsername(), courseid).isMember()) {
@@ -206,21 +199,6 @@ public class SessionService implements ISessionService {
 		return generateKeyword();
 	}
 
-	@Override
-	public final LoggedIn registerAsOnlineUser(final String sessionkey) {
-		/* HTTP polling solution (legacy) */
-
-		final Session session = this.joinSession(sessionkey);
-		if (session == null) {
-			throw new NotFoundException();
-		}
-		if (session.getCreator().equals(userService.getCurrentUser().getUsername())) {
-			databaseDao.updateSessionOwnerActivity(session);
-		}
-
-		return databaseDao.registerAsOnlineUser(userService.getCurrentUser(), session);
-	}
-
 	@Override
 	public int countSessions(final List<Course> courses) {
 		final List<Session> sessions = databaseDao.getCourseSessions(courses);
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index adc41130b4ab431d0878f2f0828ce7214afb4f07..933b49fdf246128653925efa4c66b2d0f373ccd5 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -58,14 +58,10 @@ import de.thm.arsnova.socket.ARSnovaSocketIOServer;
 @Service
 public class UserService implements IUserService {
 
-	private static final int DEFAULT_SCHEDULER_DELAY_MS = 60000;
-
 	private static final int LOGIN_TRY_RESET_DELAY_MS = 30 * 1000;
 
 	private static final int LOGIN_BAN_RESET_DELAY_MS = 2 * 60 * 1000;
 
-	private static final int MAX_USER_INACTIVE_SECONDS = 120;
-
 	private static final int REPEATED_PASSWORD_RESET_DELAY_MS = 3 * 60 * 1000;
 	
 	private static final int PASSWORD_RESET_KEY_DURABILITY_MS = 2 * 60 * 60 * 1000;
@@ -77,9 +73,6 @@ public class UserService implements IUserService {
 	/* used for Socket.IO online check solution (new) */
 	private static final ConcurrentHashMap<User, String> user2session = new ConcurrentHashMap<User, String>();
 
-	/* used for HTTP polling online check solution (legacy) */
-	private static final ConcurrentHashMap<User, String> user2sessionLegacy = new ConcurrentHashMap<User, String>();
-
 	@Autowired
 	private IDatabaseDao databaseDao;
 
@@ -152,28 +145,6 @@ public class UserService implements IUserService {
 		}
 	}
 
-	@Scheduled(fixedDelay = DEFAULT_SCHEDULER_DELAY_MS)
-	public final void removeInactiveUsersFromLegacyMap() {
-		final List<String> usernames = databaseDao.getActiveUsers(MAX_USER_INACTIVE_SECONDS);
-		final Set<String> affectedSessions = new HashSet<String>();
-
-		for (final Entry<User, String> e : user2sessionLegacy.entrySet()) {
-			final User key = e.getKey();
-			if (usernames != null && !usernames.contains(key.getUsername())) {
-				if (null != e.getValue()) {
-					affectedSessions.add(e.getValue());
-				} else {
-					LOGGER.warn("Session for user {} is null", key);
-				}
-				user2sessionLegacy.remove(e.getKey());
-			}
-		}
-
-		for (final String sessionKeyword : affectedSessions) {
-			socketIoServer.reportActiveUserCountForSession(sessionKeyword);
-		}
-	}
-
 	@Override
 	public User getCurrentUser() {
 		final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -267,12 +238,9 @@ public class UserService implements IUserService {
 		if (keyword == null) {
 			return false;
 		}
-		String session = user2sessionLegacy.get(user);
+		String session = user2session.get(user);
 		if (session == null) {
-			session = user2session.get(user);
-			if (session == null) {
-				return false;
-			}
+			return false;
 		}
 
 		return keyword.equals(session);
@@ -286,25 +254,10 @@ public class UserService implements IUserService {
 				result.add(e.getKey());
 			}
 		}
-		for (final Entry<User, String> e : user2sessionLegacy.entrySet()) {
-			if (e.getValue().equals(keyword)) {
-				result.add(e.getKey());
-			}
-		}
 
 		return result;
 	}
 
-	@Override
-	@Transactional(isolation = Isolation.READ_COMMITTED)
-	public void addCurrentUserToSessionMap(final String keyword) {
-		final User user = getCurrentUser();
-		if (user == null) {
-			throw new UnauthorizedException();
-		}
-		user2sessionLegacy.put(user, keyword);
-	}
-
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public void addUserToSessionBySocketId(final UUID socketId, final String keyword) {
@@ -331,11 +284,6 @@ public class UserService implements IUserService {
 				return entry.getValue();
 			}
 		}
-		for (final Entry<User, String> entry  : user2sessionLegacy.entrySet()) {
-			if (entry.getKey().getUsername().equals(username)) {
-				return entry.getValue();
-			}
-		}
 
 		return null;
 	}
@@ -349,13 +297,12 @@ public class UserService implements IUserService {
 	public void removeUserFromMaps(final User user) {
 		if (user != null) {
 			user2session.remove(user);
-			user2sessionLegacy.remove(user);
 		}
 	}
 
 	@Override
 	public int loggedInUsers() {
-		return user2sessionLegacy.size();
+		return user2session.size();
 	}
 
 	@Override
diff --git a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
index 4860c0746b8a68a0dea2f49d99e1a53371b4c1dc..76ca780e0d21123f0f045dbf599765d6a2c4c4d0 100644
--- a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
@@ -147,14 +147,6 @@ public class SessionControllerTest {
 		.andExpect(header().string(AbstractController.X_DEPRECATED_API, "1"));
 	}
 
-	@Test
-	public void testShouldEndInUnauthorizedResult() throws Exception {
-		setAuthenticated(false, "ptsr00");
-
-		mockMvc.perform(post("/session/12345678/online").accept(MediaType.APPLICATION_JSON))
-		.andExpect(status().isUnauthorized());
-	}
-
 	@Test
 	public void testShouldEndInForbidden() throws Exception {
 		setAuthenticated(true, "ptsr00");
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 8dcafd979a2068b3220978605480cabd57c21586..0c61d957ba7e4712e8e1cf624ac53885fcb45f0d 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -28,7 +28,6 @@ import de.thm.arsnova.connector.model.Course;
 import de.thm.arsnova.entities.Answer;
 import de.thm.arsnova.entities.DbUser;
 import de.thm.arsnova.entities.Feedback;
-import de.thm.arsnova.entities.FoodVote;
 import de.thm.arsnova.entities.InterposedQuestion;
 import de.thm.arsnova.entities.InterposedReadingCount;
 import de.thm.arsnova.entities.LoggedIn;
@@ -264,18 +263,6 @@ public class StubDatabaseDao implements IDatabaseDao {
 
 	}
 
-	@Override
-	public int getFoodVoteCount() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public List<FoodVote> getFoodVote() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	@Override
 	public int countAnswers() {
 		// TODO Auto-generated method stub
diff --git a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
index 09c07f18580afea478ee913eed35b2b2efb68cd4..d3a7211408197d4f070393ba5464ea86538d369b 100644
--- a/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/SessionServiceTest.java
@@ -103,13 +103,13 @@ public class SessionServiceTest {
 	@Test(expected = NotFoundException.class)
 	public void testShouldNotFindNonExistantSession() {
 		setAuthenticated(true, "ptsr00");
-		sessionService.joinSession("00000000");
+		sessionService.getSession("00000000");
 	}
 
 	@Test(expected = AuthenticationCredentialsNotFoundException.class)
 	public void testShouldNotReturnSessionIfUnauthorized() {
 		setAuthenticated(false, null);
-		sessionService.joinSession("12345678");
+		sessionService.getSession("12345678");
 	}
 
 	@Test(expected = AuthenticationCredentialsNotFoundException.class)
@@ -126,7 +126,7 @@ public class SessionServiceTest {
 
 		setAuthenticated(true, "ptsr00");
 
-		assertNull(sessionService.joinSession("11111111"));
+		assertNull(sessionService.getSession("11111111"));
 	}
 
 	@Test
@@ -140,7 +140,7 @@ public class SessionServiceTest {
 		session.setName("TestSessionX");
 		session.setShortName("TSX");
 		sessionService.saveSession(session);
-		assertNotNull(sessionService.joinSession("11111111"));
+		assertNotNull(sessionService.getSession("11111111"));
 	}
 
 	@Test(expected = AccessDeniedException.class)