remove obsolete macros