OpFlex removed from master