More cleanups in ovxlib