Vagrant things, minor clean