More VMType cleanup