Some cleanup to make Vagrant work.