Check for schema generation state when removing fields

Check for schema generation state when removing fields #9551