Remove deprecated or useless macros