Get rid of unneeded helpers