Cleanup even more unused macros...