Moved to util.h