diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go
index 4b494f1e06..3c5e7fed9e 100644
--- a/swarm/network/stream/delivery.go
+++ b/swarm/network/stream/delivery.go
@@ -139,7 +139,7 @@ type RetrieveRequestMsg struct {
 }
 
 //TODO: what is the correct price
-func (rrm *RetrieveRequestMsg) GetMsgPrice() *big.Int {
+func (rrm *RetrieveRequestMsg) Price() *big.Int {
 	return big.NewInt(int64(4096))
 }
 
diff --git a/swarm/network_test.go b/swarm/network_test.go
index 4771676856..81eb8005fa 100644
--- a/swarm/network_test.go
+++ b/swarm/network_test.go
@@ -44,7 +44,6 @@ var (
 	longrunning    = flag.Bool("longrunning", false, "do run long-running tests")
 	waitKademlia   = flag.Bool("waitkademlia", false, "wait for healthy kademlia before checking files availability")
 	printStats     = flag.Bool("printstats", false, "print accounting stats to STDOUT")
-	bucketKeySwap  = simulation.BucketKey("swap")
 	bucketKeySwarm = simulation.BucketKey("swarm")
 )