Delete more unused macros