Puppet / vagrant cleanup