comment cleanup; remove vestiges of 'client' slot