activeSessionUserId method removed + code review update