diff --git a/aries_cloudagent/config/tests/test_wallet.py b/aries_cloudagent/config/tests/test_wallet.py
index dcdf9dc416..489236eae3 100644
--- a/aries_cloudagent/config/tests/test_wallet.py
+++ b/aries_cloudagent/config/tests/test_wallet.py
@@ -38,6 +38,24 @@ async def test_wallet_config_existing_replace(self):
 
             await test_module.wallet_config(context, provision=True)
 
+    async def test_wallet_config_non_indy_x(self):
+        settings = {
+            "wallet.seed": "00000000000000000000000000000000",
+        }
+        mock_wallet = async_mock.MagicMock(
+            type="not-indy",
+            name="Test Wallet",
+            created=False,
+            get_public_did=async_mock.CoroutineMock(
+                return_value=async_mock.MagicMock(did=TEST_DID, verkey=TEST_VERKEY)
+            ),
+        )
+        context = InjectionContext(settings=settings, enforce_typing=False)
+        context.injector.bind_instance(BaseWallet, mock_wallet)
+
+        with self.assertRaises(test_module.ConfigError):
+            await test_module.wallet_config(context, provision=True)
+
     async def test_wallet_config_bad_seed_x(self):
         settings = {
             "wallet.seed": "00000000000000000000000000000000",
diff --git a/aries_cloudagent/holder/routes.py b/aries_cloudagent/holder/routes.py
index d1b2b9577d..19f5c2424d 100644
--- a/aries_cloudagent/holder/routes.py
+++ b/aries_cloudagent/holder/routes.py
@@ -255,7 +255,7 @@ async def register(app: web.Application):
                 credentials_attr_mime_types_get,
                 allow_head=False,
             ),
-            web.post("/credential/{credential_id}/remove", credentials_remove),
+            web.delete("/credential/{credential_id}", credentials_remove),
             web.get("/credentials", credentials_list, allow_head=False),
         ]
     )
diff --git a/aries_cloudagent/protocols/connections/v1_0/routes.py b/aries_cloudagent/protocols/connections/v1_0/routes.py
index 9c21695399..3713c3e526 100644
--- a/aries_cloudagent/protocols/connections/v1_0/routes.py
+++ b/aries_cloudagent/protocols/connections/v1_0/routes.py
@@ -582,7 +582,7 @@ async def register(app: web.Application):
                 "/connections/{conn_id}/establish-inbound/{ref_id}",
                 connections_establish_inbound,
             ),
-            web.post("/connections/{conn_id}/remove", connections_remove),
+            web.delete("/connections/{conn_id}", connections_remove),
         ]
     )
 
diff --git a/aries_cloudagent/protocols/issue_credential/v1_0/routes.py b/aries_cloudagent/protocols/issue_credential/v1_0/routes.py
index e133b9c016..e869620f09 100644
--- a/aries_cloudagent/protocols/issue_credential/v1_0/routes.py
+++ b/aries_cloudagent/protocols/issue_credential/v1_0/routes.py
@@ -1258,6 +1258,10 @@ async def register(app: web.Application):
                 "/issue-credential/records/{cred_ex_id}/problem-report",
                 credential_exchange_problem_report,
             ),
+            web.delete(
+                "/issue-credential/records/{cred_ex_id}",
+                credential_exchange_remove,
+            ),
         ]
     )
 
diff --git a/aries_cloudagent/protocols/present_proof/v1_0/routes.py b/aries_cloudagent/protocols/present_proof/v1_0/routes.py
index 0bf5a42547..160a0578a6 100644
--- a/aries_cloudagent/protocols/present_proof/v1_0/routes.py
+++ b/aries_cloudagent/protocols/present_proof/v1_0/routes.py
@@ -1093,8 +1093,8 @@ async def register(app: web.Application):
                 "/present-proof/records/{pres_ex_id}/verify-presentation",
                 presentation_exchange_verify_presentation,
             ),
-            web.post(
-                "/present-proof/records/{pres_ex_id}/remove",
+            web.delete(
+                "/present-proof/records/{pres_ex_id}",
                 presentation_exchange_remove,
             ),
         ]