Cleanup for AD-2 migration