Removed uneeded code for default group