Revert "Cleanup before Herburt"

This reverts commit 5e9567770bdde9615c05df88948a3baf08dbbefc.
Revert "Revert "Cleanup before Herburt""

This reverts commit 81141e0a91d9a66bba47314fc66c22a1cf139a47.