simple cleanups (removal of ancient macros)