Finish sign in
Cleanup
Cleanup some more
Merge branch 'sign-in-out'