diff --git a/libabyss/src/client.cpp b/libabyss/src/client.cpp
index 121cd0df8..dba23ba42 100644
--- a/libabyss/src/client.cpp
+++ b/libabyss/src/client.cpp
@@ -77,7 +77,7 @@ namespace abyss
       }
 
       static void
-      OnTick(ABSL_ATTRIBUTE_UNUSED llarp_tcp_conn* conn)
+      OnTick(llarp_tcp_conn* /*conn*/)
       {
       }
 
diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
index 581602365..c46a867bc 100644
--- a/llarp/config/config.cpp
+++ b/llarp/config/config.cpp
@@ -330,8 +330,7 @@ namespace llarp
   }
 
   void
-  ConnectConfig::fromSection(ABSL_ATTRIBUTE_UNUSED string_view key,
-                             string_view val)
+  ConnectConfig::fromSection(string_view /*key*/, string_view val)
   {
     routers.emplace_back(val.begin(), val.end());
   }
diff --git a/llarp/dht/messages/gotintro.cpp b/llarp/dht/messages/gotintro.cpp
index f9e0c6060..516a9b597 100644
--- a/llarp/dht/messages/gotintro.cpp
+++ b/llarp/dht/messages/gotintro.cpp
@@ -20,8 +20,7 @@ namespace llarp
     bool
     GotIntroMessage::HandleMessage(
         llarp_dht_context *ctx,
-        ABSL_ATTRIBUTE_UNUSED std::vector< std::unique_ptr< IMessage > >
-            &replies) const
+        std::vector< std::unique_ptr< IMessage > > & /*replies*/) const
     {
       auto &dht = *ctx->impl;
 
diff --git a/llarp/messages/discard.hpp b/llarp/messages/discard.hpp
index 7a631bad5..db118faba 100644
--- a/llarp/messages/discard.hpp
+++ b/llarp/messages/discard.hpp
@@ -54,7 +54,7 @@ namespace llarp
     }
 
     bool
-    HandleMessage(ABSL_ATTRIBUTE_UNUSED AbstractRouter* router) const override
+    HandleMessage(AbstractRouter* /*router*/) const override
     {
       return true;
     }
diff --git a/llarp/messages/link_intro.cpp b/llarp/messages/link_intro.cpp
index 0059645a7..bcb502b89 100644
--- a/llarp/messages/link_intro.cpp
+++ b/llarp/messages/link_intro.cpp
@@ -99,8 +99,7 @@ namespace llarp
   }
 
   bool
-  LinkIntroMessage::HandleMessage(
-      ABSL_ATTRIBUTE_UNUSED AbstractRouter* router) const
+  LinkIntroMessage::HandleMessage(AbstractRouter* /*router*/) const
   {
     if(!Verify())
       return false;
diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp
index 1697bdb77..f655b1d79 100644
--- a/llarp/path/path.cpp
+++ b/llarp/path/path.cpp
@@ -625,9 +625,8 @@ namespace llarp
     }
 
     bool
-    Path::HandlePathTransferMessage(
-        ABSL_ATTRIBUTE_UNUSED const routing::PathTransferMessage& msg,
-        ABSL_ATTRIBUTE_UNUSED AbstractRouter* r)
+    Path::HandlePathTransferMessage(const routing::PathTransferMessage& /*msg*/,
+                                    AbstractRouter* /*r*/)
     {
       LogWarn("unwarranted path transfer message on tx=", TXID(),
               " rx=", RXID());
@@ -675,9 +674,8 @@ namespace llarp
     }
 
     bool
-    Path::HandlePathConfirmMessage(
-        ABSL_ATTRIBUTE_UNUSED const routing::PathConfirmMessage& msg,
-        AbstractRouter* r)
+    Path::HandlePathConfirmMessage(const routing::PathConfirmMessage& /*msg*/,
+                                   AbstractRouter* r)
     {
       return HandlePathConfirmMessage(r);
     }
@@ -725,7 +723,7 @@ namespace llarp
 
     bool
     Path::HandleCloseExitMessage(const routing::CloseExitMessage& msg,
-                                 ABSL_ATTRIBUTE_UNUSED AbstractRouter* r)
+                                 AbstractRouter* /*r*/)
     {
       /// allows exits to close from their end
       if(SupportsAnyRoles(ePathRoleExit | ePathRoleSVC))
diff --git a/llarp/path/transit_hop.hpp b/llarp/path/transit_hop.hpp
index fb7ecde58..a9c5824bc 100644
--- a/llarp/path/transit_hop.hpp
+++ b/llarp/path/transit_hop.hpp
@@ -191,8 +191,7 @@ namespace llarp
                              AbstractRouter* r) override;
 
       bool
-      HandleHiddenServiceFrame(
-          ABSL_ATTRIBUTE_UNUSED const service::ProtocolFrame& frame) override
+      HandleHiddenServiceFrame(const service::ProtocolFrame& /*frame*/) override
       {
         /// TODO: implement me
         LogWarn("Got hidden service data on transit hop");
diff --git a/llarp/pow.cpp b/llarp/pow.cpp
index 11673ff43..7588ce5a2 100644
--- a/llarp/pow.cpp
+++ b/llarp/pow.cpp
@@ -10,8 +10,7 @@ namespace llarp
   PoW::~PoW() = default;
 
   bool
-  PoW::DecodeKey(ABSL_ATTRIBUTE_UNUSED const llarp_buffer_t& k,
-                 ABSL_ATTRIBUTE_UNUSED llarp_buffer_t* val)
+  PoW::DecodeKey(const llarp_buffer_t& /*k*/, llarp_buffer_t* /*val*/)
   {
     // TODO: implement me
     return false;
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index 8e1f0c003..d0e3b73da 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -805,7 +805,7 @@ namespace llarp
   }
 
   void
-  Router::HandleDHTLookupForExplore(ABSL_ATTRIBUTE_UNUSED RouterID remote,
+  Router::HandleDHTLookupForExplore(RouterID /*remote*/,
                                     const std::vector< RouterContact > &results)
   {
     for(const auto &rc : results)
@@ -1180,7 +1180,7 @@ namespace llarp
   }
 
   bool
-  Router::ValidateConfig(ABSL_ATTRIBUTE_UNUSED Config *conf) const
+  Router::ValidateConfig(Config * /*conf*/) const
   {
     return true;
   }
diff --git a/llarp/rpc/rpc.cpp b/llarp/rpc/rpc.cpp
index 2cd31aaf8..4fe6f6576 100644
--- a/llarp/rpc/rpc.cpp
+++ b/llarp/rpc/rpc.cpp
@@ -401,8 +401,7 @@ namespace llarp
       }
 
       Response
-      HandleJSONRPC(Method_t method,
-                    ABSL_ATTRIBUTE_UNUSED const Params& params) override
+      HandleJSONRPC(Method_t method, const Params& /*params*/) override
       {
         auto it = m_dispatch.find(method);
         if(it != m_dispatch.end())
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index a55288b30..10e3b8c61 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -196,10 +196,7 @@ namespace llarp
         if(!EndpointUtil::HasPathToService(addr, m_state->m_RemoteSessions))
         {
           if(!EnsurePathToService(
-                 addr,
-                 [](ABSL_ATTRIBUTE_UNUSED Address _addr,
-                    ABSL_ATTRIBUTE_UNUSED OutboundContext* _ctx) {},
-                 10000))
+                 addr, [](Address, OutboundContext*) {}, 10000))
           {
             LogWarn("failed to ensure path to ", addr);
           }
@@ -966,7 +963,7 @@ namespace llarp
 
     bool
     Endpoint::EnsurePathToService(const Address remote, PathEnsureHook hook,
-                                  ABSL_ATTRIBUTE_UNUSED llarp_time_t timeoutMS)
+                                  llarp_time_t /*timeoutMS*/)
     {
       static constexpr size_t NumParalellLookups = 2;
       LogInfo(Name(), " Ensure Path to ", remote.ToString());
@@ -1120,9 +1117,8 @@ namespace llarp
     }
 
     bool
-    Endpoint::EnsureConvo(ABSL_ATTRIBUTE_UNUSED const AlignedBuffer< 32 > addr,
-                          bool snode,
-                          ABSL_ATTRIBUTE_UNUSED ConvoEventListener_ptr ev)
+    Endpoint::EnsureConvo(const AlignedBuffer< 32 > /*addr*/, bool snode,
+                          ConvoEventListener_ptr /*ev*/)
     {
       if(snode)
       {
diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index 68d47ad3a..9e7b97d1a 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -460,7 +460,7 @@ namespace llarp
 
     bool
     ProtocolFrame::HandleMessage(routing::IMessageHandler* h,
-                                 ABSL_ATTRIBUTE_UNUSED AbstractRouter* r) const
+                                 AbstractRouter* /*r*/) const
     {
       return h->HandleHiddenServiceFrame(*this);
     }