Now does not use schema
Finished removal of Fabric