Revert "clean up utils"

This reverts commit f8593345028add93f248572afad16f311eaa97c7.
clean up utils