Clean-up from unused utils.h/utils/cpp