remove helpers from TOC for refactoring