Remove unused helpers
Remove unused methods
Eliminate trailing whitespace.