Removed parts of the group handling stuff