removed unnecessary macros