change: unused macros has been removed.