- Removed VM arg from several functions