Remove unused form fields