remove check_fields