Remove RECOVERY_VARIANT, cm recovery is default now