WIP: pickle: rm special cases, plugins pickle now
2 files changed