Clean up unused helper functinos
Merge pull request #1310 from tricknotes/clean-up-unused

Clean up unused helper functinos