Cleanup of login
Cleanup