removed unneeded macros