Revert "pickles / klutch stuff"

This reverts commit d918cf3f84ea8a20f9b930d33f4374e6e15b1c89.