Removed login logic
Finished implementing @StevenLawson's changes. Resolves #1