Removed useless definitions in util.hh