Removed unnecessary form elements