Fix removing macros