Remove math/util, will define macros where needed