removbe useless code and rename macro