Removing reference to Schemata