remove some mess
remove dublicate macros