Removed loginActivity
Cleaned up code