Remove more macros