Make remove_field_helper not dependent on python