Add possibility to remove fields from schema
Make sure code validation works properly in edit mode, too