Clean up the schema