Clean up some of the old code...
Add core stuff to vm