Clean up registration form

Clean up registration form