Removed unnecessary form fields