more form clean up