bna: get rid of duplicate and unused macros