more pickle cleanups