[OE-3805] Remove unused fields and add relevant migration to consolidation.