removed utility.hh and utility.cc