SCHEMA-247. More clean-up.