Consolidate LoginServlet and LogoutServlet into AuthServlet and clean up code