Clean up & refactor signin
Clean up server