Removed more macros.