Remove some macros that I don't have/use anymore.