Cleaning up the login strategies