Finished initial cleanup to make VM configurable and usable across mutliple projects