Removed pointless macros