CXX-321 remove optime