Remove dead helper code