remove code that is now in upstream OpenCV