Now that we have the utility header it's best that all those macros go away
Now that we have the utility header it's best that all those macros go away