Cleanup

This brings the VM size down to 470MB from 760MB.