remove unused macro
comment out unused macros