remove domainUtil, move functionality to more specific locations