Remove ALLOW_LEGACY_AND_VRF