removing annoying macros