Updates to 2 VM approach - moving clean up code to different branch