diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
deleted file mode 100644
index 71d5bab..0000000
--- a/vagrant/Vagrantfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-    config.vm.box = "precise64"
-    config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-    config.vm.network :public_network
-    config.vm.network :forwarded_port, guest: 8000, host: 8080
-    config.vm.synced_folder "../", "/home/vagrant/chihaya/src/github.com/pushrax/chihaya"
-
-    config.vm.provider :virtualbox do |vb|
-        vb.customize ["modifyvm", :id, "--name", "chihaya"]
-    end
-
-    config.vm.provision :puppet do |puppet|
-        puppet.manifests_path = "puppet/manifests"
-        puppet.manifest_file = "default.pp"
-        puppet.module_path = "puppet/modules"
-    end
-end
diff --git a/vagrant/puppet/manifests/default.pp b/vagrant/puppet/manifests/default.pp
deleted file mode 100644
index b876016..0000000
--- a/vagrant/puppet/manifests/default.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-Exec { path => '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/' }
-exec { 'echo this works': }
-
-group { 'puppet': ensure => 'present' }
-
-exec { 'chown -R vagrant:vagrant /home/vagrant/':
-}
-
-exec { 'apt-get update':
-	command => '/usr/bin/apt-get update',
-}
-
-exec { 'add-apt-repository ppa:chris-lea/zeromq && apt-get update':
-	require => Package['python-software-properties'],
-	alias   => 'zmq_repo',
-	creates => '/etc/apt/sources.list.d/chris-lea-zeromq-precise.list',
-}
-
-exec { 'add-apt-repository ppa:duh/golang && apt-get update':
-	alias   => 'go_repo',
-	creates => '/etc/apt/sources.list.d/gophers-go-precise.list',
-	require => Package['python-software-properties'],
-}
-
-package { 'pkg-config':
-	require => Exec['apt-get update'],
-	ensure  => present,
-}
-
-package { 'libzmq-dev':
-	require => [
-		Exec['zmq_repo'],
-		Package['pkg-config'],
-	],
-	ensure  => present,
-}
-
-package { 'python-software-properties':
-	require => Exec['apt-get update'],
-	ensure  => present,
-}
-
-package { 'git':
-	require => Exec['apt-get update'],
-	ensure  => present,
-}
-
-package { 'golang':
-	require => Exec['go_repo'],
-	ensure  => present,
-}
-
-exec { 'echo "export GOPATH=/home/vagrant/chihaya" > /etc/profile.d/gopath.sh':
-	alias   => 'go_path',
-	creates => '/etc/profile.d/gopath.sh',
-}
diff --git a/vagrant/puppet/modules/.gitkeep b/vagrant/puppet/modules/.gitkeep
deleted file mode 100644
index e69de29..0000000