get rid of utils.h
2 files changed