CleanUp to reflect changes in LoginController