removed old useless macros
removed old useless macros