removed unneeded branches in macros