Cleanup
Trim helper junk from the public API