Removing ancient stuff, adding new

* The Amazon stuff doesn't belong here
* Some modern puppet code does