Removed unneeded helpers