diff --git a/app/sagas/login.js b/app/sagas/login.js
index aad736990..c3f987054 100644
--- a/app/sagas/login.js
+++ b/app/sagas/login.js
@@ -118,8 +118,6 @@ const fetchRooms = function* fetchRooms() {
 
 const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 	try {
-		// const adding = yield select(state => state.server.adding);
-
 		RocketChat.getUserPresence(user.id);
 
 		const server = yield select(getServer);
@@ -170,26 +168,11 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 		yield put(setUser(user));
 		EventEmitter.emit('connected');
 
-		// let currentRoot;
-		// const currentRoot = yield select(state => state.app.root);
-		// if (adding) {
-		// 	yield put(serverFinishAdd());
-		// 	yield put(appStart({ root: ROOT_INSIDE }));
-		// } else {
-		// currentRoot = yield select(state => state.app.root);
-		// if (currentRoot !== ROOT_INSIDE) {
 		yield put(appStart({ root: ROOT_INSIDE }));
-		// }
-		// }
-
-		// after a successful login, check if it's been invited via invite link
-		// currentRoot = yield select(state => state.app.root);
-		// if (currentRoot === ROOT_INSIDE) {
 		const inviteLinkToken = yield select(state => state.inviteLinks.token);
 		if (inviteLinkToken) {
 			yield put(inviteLinksRequest(inviteLinkToken));
 		}
-		// }
 	} catch (e) {
 		log(e);
 	}
diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js
index 9e7b38d7d..bea50c434 100644
--- a/app/sagas/selectServer.js
+++ b/app/sagas/selectServer.js
@@ -136,12 +136,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
 		// we'll set serverVersion as metadata for bugsnag
 		logServerVersion(serverVersion);
 		yield put(selectServerSuccess(server, serverVersion));
-
-		// // if the adding state is true, finish add server
-		// const adding = yield select(state => state.server.adding);
-		// if (adding) {
-		// 	yield put(serverFinishAdd());
-		// }
 	} catch (e) {
 		yield put(selectServerFailure());
 		log(e);
diff --git a/app/views/NewServerView/index.js b/app/views/NewServerView/index.js
index 68e1e83aa..ccc9119a8 100644
--- a/app/views/NewServerView/index.js
+++ b/app/views/NewServerView/index.js
@@ -74,7 +74,6 @@ class NewServerView extends React.Component {
 		connecting: PropTypes.bool.isRequired,
 		connectServer: PropTypes.func.isRequired,
 		selectServer: PropTypes.func.isRequired,
-		// adding: PropTypes.bool,
 		previousServer: PropTypes.string,
 		inviteLinksClear: PropTypes.func,
 		serverFinishAdd: PropTypes.func
@@ -101,13 +100,6 @@ class NewServerView extends React.Component {
 		this.queryServerHistory();
 	}
 
-	// componentDidUpdate(prevProps) {
-	// 	const { adding } = this.props;
-	// 	if (prevProps.adding !== adding) {
-	// 		this.setHeader();
-	// 	}
-	// }
-
 	componentWillUnmount() {
 		EventEmitter.removeListener('NewServer', this.handleNewServerEvent);
 		BackHandler.removeEventListener('hardwareBackPress', this.handleBackPress);
@@ -407,7 +399,6 @@ class NewServerView extends React.Component {
 
 const mapStateToProps = state => ({
 	connecting: state.server.connecting,
-	// adding: state.server.adding,
 	previousServer: state.server.previousServer
 });