get rid of utils.h
5 files changed