Remove unneeded helpers