Remove some more unused macros