diff --git a/docs/architecture/README.md b/docs/architecture/README.md
index d3ff033688..54cc9c89e4 100644
--- a/docs/architecture/README.md
+++ b/docs/architecture/README.md
@@ -43,18 +43,21 @@ Read about the [PROCESS](./PROCESS.md).
 
 - [ADR 001: Coin Source Tracing](./adr-001-coin-source-tracing.md)
 - [ADR 002: SDK Documentation Structure](./adr-002-docs-structure.md)
+- [ADR 004: Split Denomination Keys](./adr-004-split-denomination-keys.md)
 - [ADR 006: Secret Store Replacement](./adr-006-secret-store-replacement.md)
 - [ADR 009: Evidence Module](./adr-009-evidence-module.md)
 - [ADR 010: Modular AnteHandler](./adr-010-modular-antehandler.md)
 - [ADR 019: Protocol Buffer State Encoding](./adr-019-protobuf-state-encoding.md)
 - [ADR 020: Protocol Buffer Transaction Encoding](./adr-020-protobuf-transaction-encoding.md)
+- [ADR 021: Protocol Buffer Query Encoding](./adr-021-protobuf-query-encoding.md)
+- [ADR 023: Protocol Buffer Naming and Versioning](./adr-023-protobuf-naming.md)
 - [ADR 026: IBC Client Recovery Mechanisms](./adr-026-ibc-client-recovery-mechanisms.md)
 - [ADR 029: Fee Grant Module](./adr-029-fee-grant-module.md)
+- [ADR 031: Protobuf Msg Services](./adr-031-msg-service.md)
 
 ### Proposed
 
 - [ADR 003: Dynamic Capability Store](./adr-003-dynamic-capability-store.md)
-- [ADR 004: Split Denomination Keys](./adr-004-split-denomination-keys.md)
 - [ADR 011: Generalize Genesis Accounts](./adr-011-generalize-genesis-accounts.md)
 - [ADR 012: State Accessors](./adr-012-state-accessors.md)
 - [ADR 013: Metrics](./adr-013-metrics.md)
@@ -62,14 +65,11 @@ Read about the [PROCESS](./PROCESS.md).
 - [ADR 016: Validator Consensus Key Rotation](./adr-016-validator-consensus-key-rotation.md)
 - [ADR 017: Historical Header Module](./adr-017-historical-header-module.md)
 - [ADR 018: Extendable Voting Periods](./adr-018-extendable-voting-period.md)
-- [ADR 021: Protocol Buffer Query Encoding](./adr-021-protobuf-query-encoding.md)
 - [ADR 022: Custom baseapp panic handling](./adr-022-custom-panic-handling.md)
-- [ADR 023: Protocol Buffer Naming and Versioning](./adr-023-protobuf-naming.md)
 - [ADR 024: Coin Metadata](./adr-024-coin-metadata.md)
 - [ADR 025: IBC Passive Channels](./adr-025-ibc-passive-channels.md)
 - [ADR 027: Deterministic Protobuf Serialization](./adr-027-deterministic-protobuf-serialization.md)
 - [ADR 028: Public Key Addresses](./adr-028-public-key-addresses.md)
-- [ADR 031: Protobuf Msg Services](./adr-031-msg-service.md)
 - [ADR 032: Typed Events](./adr-032-typed-events.md)
 - [ADR 035: Rosetta API Support](./adr-035-rosetta-api-support.md)
 - [ADR 037: Governance Split Votes](./adr-037-gov-split-vote.md)
\ No newline at end of file
diff --git a/docs/architecture/adr-004-split-denomination-keys.md b/docs/architecture/adr-004-split-denomination-keys.md
index d33b7c6d03..a718d9b0ca 100644
--- a/docs/architecture/adr-004-split-denomination-keys.md
+++ b/docs/architecture/adr-004-split-denomination-keys.md
@@ -96,7 +96,7 @@ the balances and check that they match the expected total supply.
 
 ## Status
 
-Proposed.
+Accepted.
 
 ## Consequences
 
diff --git a/docs/architecture/adr-021-protobuf-query-encoding.md b/docs/architecture/adr-021-protobuf-query-encoding.md
index ba0b35cd96..60d4d2b2f6 100644
--- a/docs/architecture/adr-021-protobuf-query-encoding.md
+++ b/docs/architecture/adr-021-protobuf-query-encoding.md
@@ -6,7 +6,7 @@
 
 ## Status
 
-Proposed
+Accepted
 
 ## Context
 
diff --git a/docs/architecture/adr-023-protobuf-naming.md b/docs/architecture/adr-023-protobuf-naming.md
index e909c33d1d..1322f097f5 100644
--- a/docs/architecture/adr-023-protobuf-naming.md
+++ b/docs/architecture/adr-023-protobuf-naming.md
@@ -7,7 +7,7 @@
 
 ## Status
 
-Proposed
+Accepted
 
 ## Context
 
diff --git a/docs/architecture/adr-031-msg-service.md b/docs/architecture/adr-031-msg-service.md
index edd906fdb9..a36d86c431 100644
--- a/docs/architecture/adr-031-msg-service.md
+++ b/docs/architecture/adr-031-msg-service.md
@@ -6,7 +6,7 @@
 
 ## Status
 
-Proposed
+Accepted
 
 ## Abstract
 
diff --git a/go.mod b/go.mod
index 5c05b40b71..39e2804248 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,6 @@ require (
 	github.com/golang/mock v1.4.4
 	github.com/golang/protobuf v1.4.3
 	github.com/golang/snappy v0.0.2 // indirect
-	github.com/google/go-cmp v0.5.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0