Remove remnants of helper