cleaned up usage of util and removed unused URI parser