virgo improvement phase1 cleanups