Remove unused form fields.
Improve form code.