reduce ifdeffery in rds
reduce ifdeffery in caif