Remove dead/ghost code from helper
Remove more dead code and format helper