Clean up and do single-schema entities.