more cleanup of unused/duplicated picklers