Merge "Remove legacy migration code from sync manager"