Merge "te_macros: drop unused macros"