Removed old scene::geom, but still have scene::geomXXX