CXX-321 remove optime

as above, needed to declare a variable in the switch statement.