ENG-6122 Some cleanup before real changes.
ENG-6122 Merge 2 schemachange batches and more cleanup.