unnecessary imports cleaned out
Merge remote-tracking branch 'origin/feature/mammothbane/loginscreen' into feature/mammothbane/loginscreen