get rid of utils.h
15 files changed