Cleaned up - removal of VG and unused flags