diff --git a/flowcontrol/flow_controller.go b/flowcontrol/flow_controller.go
index c6f0cb40..21020ad9 100644
--- a/flowcontrol/flow_controller.go
+++ b/flowcontrol/flow_controller.go
@@ -61,7 +61,6 @@ func (c *flowController) UpdateSendWindow(newOffset protocol.ByteCount) bool {
 	return false
 }
 
-// TODO: remove once the Stream doesn't use it anymore
 func (c *flowController) SendWindowSize() protocol.ByteCount {
 	sendFlowControlWindow := c.getSendFlowControlWindow()
 
diff --git a/session.go b/session.go
index c9737f4b..8de0372b 100644
--- a/session.go
+++ b/session.go
@@ -569,7 +569,6 @@ func (s *Session) GetOrOpenStream(id protocol.StreamID) (utils.Stream, error) {
 	return s.streamsMap.GetOrOpenStream(id)
 }
 
-// The streamsMutex is locked by OpenStream or GetOrOpenStream before calling this function.
 func (s *Session) newStreamImpl(id protocol.StreamID) (*stream, error) {
 	return s.streamsMap.GetOrOpenStream(id)
 }
diff --git a/stream_framer.go b/stream_framer.go
index 0900660c..f344ef99 100644
--- a/stream_framer.go
+++ b/stream_framer.go
@@ -10,7 +10,6 @@ import (
 )
 
 type streamFramer struct {
-	// TODO: Simplify by extracting the streams map into a separate object
 	streamsMap *streamsMap
 
 	flowControlManager flowcontrol.FlowControlManager