Removed unnecessary fields from form