Remove a couple of unnecessary properties from VM