Remove some more references to utilities