Cleaning up several controllers relating to sign in