Remove unnecessary duplications from cpp-util