Remove lots of VG_STATES dependancies

These appear not to have been needed.