OP-1216 remove commented out define as review requested