virgo improvement phase1 cleanups, redo