removed unused helpers, refactoring to use them would be good but not easily accessible at current level