Remove unused code in helper