remove duping in util methods, remove unneeded methods