Remove some traces of VPM.