Cleanup

The first two commits are just some general cleanup.

The last commit feel free to contest though. I took out the architecture piece since we're going to move to less beefy boxes soon based on usage. Perhaps we should still give nod to Salt Stack though.