Remove some more util functions