remove dead code
helper calls WIP

Breaks some tests.  Not sure what's happening.