Fixing Pickling Cleanup