Minor cleanup now that there isn't a util mod