remove redundant macros