Removed unnecessary fields from forms