Clean up sign up form, close #49