Remove unnecessary math util macros