diff --git a/api/cerc/bond/v1/genesis.pulsar.go b/api/cerc/bond/v1/genesis.pulsar.go
index 93d1c38e..608c6c79 100644
--- a/api/cerc/bond/v1/genesis.pulsar.go
+++ b/api/cerc/bond/v1/genesis.pulsar.go
@@ -608,7 +608,6 @@ type GenesisState struct {
 	// params defines all the parameters of the module.
 	Params *Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"`
 	// bonds defines all the bonds
-	// TODO: Add nullable = false ?
 	Bonds []*Bond `protobuf:"bytes,2,rep,name=bonds,proto3" json:"bonds,omitempty"`
 }
 
diff --git a/proto/cerc/auction/v1/query.proto b/proto/cerc/auction/v1/query.proto
index cd88fc20..d4afe85b 100644
--- a/proto/cerc/auction/v1/query.proto
+++ b/proto/cerc/auction/v1/query.proto
@@ -123,8 +123,6 @@ message QueryAuctionsByBidderRequest {
 message QueryAuctionsByBidderResponse {
   // List of auctions
   Auctions auctions = 1;
-
-  // TODO: Add pagination?
 }
 
 // AuctionsByOwnerRequest is the format for querying all auctions created by an owner
diff --git a/proto/cerc/bond/v1/genesis.proto b/proto/cerc/bond/v1/genesis.proto
index c37ba129..b6f922fb 100644
--- a/proto/cerc/bond/v1/genesis.proto
+++ b/proto/cerc/bond/v1/genesis.proto
@@ -13,6 +13,5 @@ message GenesisState {
   Params params = 1 [(gogoproto.nullable) = false];
 
   // bonds defines all the bonds
-  // TODO: Add nullable = false ?
   repeated Bond bonds = 2 [(gogoproto.moretags) = "json:\"bonds\" yaml:\"bonds\""];
 }
diff --git a/tests/e2e/auction/grpc.go b/tests/e2e/auction/grpc.go
index c285fd47..1f9c4ade 100644
--- a/tests/e2e/auction/grpc.go
+++ b/tests/e2e/auction/grpc.go
@@ -222,7 +222,7 @@ func (ets *E2ETestSuite) TestGetAuctionsByOwnerGrpc() {
 		},
 		{
 			"valid request to get auctions by owner",
-			fmt.Sprintf("%s/%s", reqURL, randomOwnerAddress), // TODO: use ownerAddress?
+			fmt.Sprintf("%s/%s", reqURL, ownerAddress),
 			"",
 			false,
 		},
diff --git a/x/bond/genesis.pb.go b/x/bond/genesis.pb.go
index 3b841b38..8d55cf9e 100644
--- a/x/bond/genesis.pb.go
+++ b/x/bond/genesis.pb.go
@@ -28,7 +28,6 @@ type GenesisState struct {
 	// params defines all the parameters of the module.
 	Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
 	// bonds defines all the bonds
-	// TODO: Add nullable = false ?
 	Bonds []*Bond `protobuf:"bytes,2,rep,name=bonds,proto3" json:"bonds,omitempty" json:"bonds" yaml:"bonds"`
 }