remove deprecated macros