Added the ability to remove macros