cleanups in BVH4i