Revert "pickler resolution partial rewrite"

This reverts commit 95db92b32765af4508605010b075546981155afc.
code cleanup