Removing unused form fields