Removed unneeded utils