[BZ 1082805] Simplify the upgrade options for the data migration. Remove more undeeded code.