Cleaning up login unused code
Clean up