removed more excess code, uncluding utils