Removed excess group check macros.