diff --git a/swarm/network/request_test.go b/swarm/network/request_test.go
index 54e5db14a1..7aa892dc13 100644
--- a/swarm/network/request_test.go
+++ b/swarm/network/request_test.go
@@ -45,7 +45,6 @@ import (
 )
 
 func TestStreamerRetrieveRequest(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -76,7 +75,6 @@ func TestStreamerRetrieveRequest(t *testing.T) {
 }
 
 func TestStreamerUpstreamRetrieveRequestMsgExchangeWithoutStore(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -131,7 +129,6 @@ func TestStreamerUpstreamRetrieveRequestMsgExchangeWithoutStore(t *testing.T) {
 // upstream request server receives a retrieve Request and responds with
 // offered hashes or delivery if skipHash is set to true
 func TestStreamerUpstreamRetrieveRequestMsgExchange(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, localStore, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -223,7 +220,6 @@ func TestStreamerUpstreamRetrieveRequestMsgExchange(t *testing.T) {
 }
 
 func TestStreamerDownstreamChunkDeliveryMsgExchange(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, localStore, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -284,18 +280,6 @@ func TestStreamerDownstreamChunkDeliveryMsgExchange(t *testing.T) {
 					Peer: peerID,
 				},
 			},
-			// Expects: []p2ptest.Expect{
-			// 	p2ptest.Expect{
-			// 		Code: 2,
-			// 		Msg: &WantedHashesMsg{
-			// 			Stream: "foo",
-			// 			Want:   []byte{5},
-			// 			From:   8,
-			// 			To:     0,
-			// 		},
-			// 		Peer: peerID,
-			// 	},
-			// },
 		})
 
 	if err != nil {
diff --git a/swarm/network/streamer_test.go b/swarm/network/streamer_test.go
index 5f2c5369ff..9d44934385 100644
--- a/swarm/network/streamer_test.go
+++ b/swarm/network/streamer_test.go
@@ -36,7 +36,6 @@ import (
 // 	log.Root().SetHandler(log.CallerFileHandler(log.LvlFilterHandler(log.LvlWarn, log.StreamHandler(os.Stderr, log.TerminalFormat(true)))))
 // }
 
-// TODO: extract newStreamer
 func newStreamerTester(t *testing.T) (*p2ptest.ProtocolTester, *Streamer, *storage.LocalStore, func(), error) {
 	// setup
 	addr := RandomAddr() // tested peers peer address
@@ -78,11 +77,6 @@ func newStreamerTester(t *testing.T) (*p2ptest.ProtocolTester, *Streamer, *stora
 	return protocolTester, streamer, localStore, teardown, nil
 }
 
-// TODO
-// func newStreamer() (*Streamer, error) {
-//
-// }
-
 func TestStreamerSubscribe(t *testing.T) {
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
@@ -147,7 +141,6 @@ func (self *testOutgoingStreamer) GetData([]byte) []byte {
 }
 
 func TestStreamerDownstreamSubscribeMsgExchange(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -190,7 +183,6 @@ func TestStreamerDownstreamSubscribeMsgExchange(t *testing.T) {
 }
 
 func TestStreamerUpstreamSubscribeMsgExchange(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {
@@ -244,7 +236,6 @@ func TestStreamerUpstreamSubscribeMsgExchange(t *testing.T) {
 }
 
 func TestStreamerDownstreamOfferedHashesMsgExchange(t *testing.T) {
-	// TODO: we only need streamer
 	tester, streamer, _, teardown, err := newStreamerTester(t)
 	defer teardown()
 	if err != nil {