Cleaning up the schema