remove vm from code paths, to match namespacing