Cleaned c++/util