Final clean up before doing minimum on Server for login testing
Merge branch 'master' of https://github.com/syreal17/SIMPL