Cleaned up files, and sliced more out of the _vm version