Registration form clean up