Remove unused helpers. Closes #46