Removed unnecessary utils