Move VG deactivation to correct stage