Deleted a bunch of stuff from puppet

There's a puppet branch, so I should probably do all of the puppet stuff
there.