Removed duplicate group check