Beginning of VFM cleanup.