diff --git a/client.go b/client.go
index 7e40cb4..caf6b33 100644
--- a/client.go
+++ b/client.go
@@ -282,9 +282,6 @@ func keepalive(conn net.Conn, quit <-chan struct{}) {
 				_ = conn.Close()
 				return
 			}
-		case <-time.After(3 * time.Second):
-			_ = conn.Close()
-			return
 		case <-quit:
 			ticker.Stop()
 			return
diff --git a/session.go b/session.go
index 8253ab6..a22f306 100644
--- a/session.go
+++ b/session.go
@@ -270,7 +270,7 @@ func (s *Session) EnableStreamManagement(o Config) {
 		case stanza.SMEnabled:
 			s.SMState = SMState{Id: p.Id}
 		case stanza.SMFailed:
-			// TODO: Store error in SMState
+			// TODO: Store error in SMState, for later inspection
 		default:
 			fmt.Println(p)
 			s.err = errors.New("unexpected reply to SM enable")