Removed some old redundant utils