on prev commit i remove useful macros