Recreate using fields as defined in schema and remove invalid steps