Removed extra roles from groups