Remove unnecessary comment
Remove unused helper
Remove unused variables
Merge pull request #1020 from tricknotes/remove-unused-valiables

Remove unused valiables