SCHEMA-247. Cleanup.