Remove cruft

Now that we're on chef11 everywhere lets tidy this up a little.