diff --git a/aeron-client/src/main/cpp_wrapper/Aeron.h b/aeron-client/src/main/cpp_wrapper/Aeron.h
index 2363ad091b..64af17848f 100644
--- a/aeron-client/src/main/cpp_wrapper/Aeron.h
+++ b/aeron-client/src/main/cpp_wrapper/Aeron.h
@@ -82,7 +82,6 @@ class Aeron
         aeron_on_close_client_pair_t closePair = {emptyCallback, nullptr};
         aeron_add_close_handler(m_aeron, &closePair);
         aeron_close(m_aeron);
-//        aeron_context_close(m_context.m_context);
 
         m_availableCounterHandlers.clear();
         m_unavailableCounterHandlers.clear();
@@ -1048,7 +1047,7 @@ class Aeron
         callback();
     }
 
-    static void emptyCallback(void *clientd)
+    static void emptyCallback(void * /* clientd */)
     {
     }
 };