Remove references to form field 'override' that was removed in last commit