Removed OpenCV macro use