diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 1109a13..453ee7e 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -260,7 +260,7 @@
             struct buffer out = alloc_buf_gc(256, &gc);
             buf_printf(&out, ">PROXY:%u,%s,%s", (l ? l->current : 0) + 1,
                        (proto_is_udp(ce->proto) ? "UDP" : "TCP"), np(ce->remote));
-            management_notify_generic(management, BSTR(&out));
+            management_notify_generic(BSTR(&out));
             management->persist.special_state_msg = BSTR(&out);
         }
         ce->flags |= CE_MAN_QUERY_PROXY;
@@ -425,7 +425,7 @@
 
         buf_printf(&out, ">REMOTE:%s,%s,%s", np(ce->remote), ce->remote_port,
                    proto2ascii(ce->proto, ce->af, false));
-        management_notify_generic(management, BSTR(&out));
+        management_notify_generic(BSTR(&out));
         management->persist.special_state_msg = BSTR(&out);
 
         ce->flags &= ~(CE_MAN_QUERY_REMOTE_MASK << CE_MAN_QUERY_REMOTE_SHIFT);
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 2b0a661..310d2e1 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -843,7 +843,7 @@
 }
 
 static void
-man_forget_passwords(struct management *man)
+man_forget_passwords(void)
 {
     ssl_purge_auth(false);
     (void)ssl_clean_auth_token();
@@ -1344,18 +1344,16 @@
  * Checks if the correct number of arguments to a management command are present
  * and otherwise prints an error and returns false.
  *
- * @param man       The management interface struct
  * @param p         pointer to the parameter array
  * @param n         number of arguments required
  * @param flags     if MN_AT_LEAST require at least n parameters and not exactly n
  * @return          Return whether p has n (or at least n) parameters
  */
 static bool
-man_need(struct management *man, const char **p, const int n, unsigned int flags)
+man_need(const char **p, const int n, unsigned int flags)
 {
-    int i;
     ASSERT(p[0]);
-    for (i = 1; i <= n; ++i)
+    for (int i = 1; i <= n; ++i)
     {
         if (!p[i])
         {
@@ -1522,7 +1520,7 @@
     }
     else if (streq(p[0], "signal"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_signal(man, p[1]);
         }
@@ -1554,7 +1552,7 @@
     }
     else if (streq(p[0], "kill"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_kill(man, p[1]);
         }
@@ -1632,7 +1630,7 @@
     }
     else if (streq(p[0], "log"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             if (p[1])
             {
@@ -1646,7 +1644,7 @@
     }
     else if (streq(p[0], "echo"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             if (p[1])
             {
@@ -1660,14 +1658,14 @@
     }
     else if (streq(p[0], "username"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_query_username(man, p[1], p[2]);
         }
     }
     else if (streq(p[0], "password"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             if (p[2])
             {
@@ -1685,25 +1683,25 @@
     }
     else if (streq(p[0], "forget-passwords"))
     {
-        man_forget_passwords(man);
+        man_forget_passwords();
     }
     else if (streq(p[0], "needok"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_query_need_ok(man, p[1], p[2]);
         }
     }
     else if (streq(p[0], "needstr"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_query_need_str(man, p[1], p[2]);
         }
     }
     else if (streq(p[0], "cr-response"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_send_cc_message(man, "CR_RESPONSE", p[1]);
         }
@@ -1718,42 +1716,42 @@
     }
     else if (streq(p[0], "bytecount"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_bytecount(man, atoi(p[1]));
         }
     }
     else if (streq(p[0], "client-kill"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             man_client_kill(man, p[1], p[2]);
         }
     }
     else if (streq(p[0], "client-deny"))
     {
-        if (man_need(man, p, 3, MN_AT_LEAST))
+        if (man_need(p, 3, MN_AT_LEAST))
         {
             man_client_deny(man, p[1], p[2], p[3], p[4]);
         }
     }
     else if (streq(p[0], "client-auth-nt"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_client_auth(man, p[1], p[2], false);
         }
     }
     else if (streq(p[0], "client-auth"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_client_auth(man, p[1], p[2], true);
         }
     }
     else if (streq(p[0], "client-pending-auth"))
     {
-        if (man_need(man, p, 4, 0))
+        if (man_need(p, 4, 0))
         {
             man_client_pending_auth(man, p[1], p[2], p[3], p[4]);
         }
@@ -1777,7 +1775,7 @@
     }
     else if (streq(p[0], "pkcs11-id-get"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_pkcs11_id_get(man, atoi(p[1]));
         }
@@ -1789,35 +1787,35 @@
     }
     else if (streq(p[0], "remote-entry-get"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             man_remote_entry_get(man, p[1], p[2]);
         }
     }
     else if (streq(p[0], "proxy"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             man_proxy(man, p);
         }
     }
     else if (streq(p[0], "remote"))
     {
-        if (man_need(man, p, 1, MN_AT_LEAST))
+        if (man_need(p, 1, MN_AT_LEAST))
         {
             man_remote(man, p);
         }
     }
     else if (streq(p[0], "push-update-broad"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             man_push_update(man, p, UPT_BROADCAST);
         }
     }
     else if (streq(p[0], "push-update-cid"))
     {
-        if (man_need(man, p, 2, 0))
+        if (man_need(p, 2, 0))
         {
             man_push_update(man, p, UPT_BY_CID);
         }
@@ -1825,7 +1823,7 @@
 #if 1
     else if (streq(p[0], "test"))
     {
-        if (man_need(man, p, 1, 0))
+        if (man_need(p, 1, 0))
         {
             int i;
             const int n = atoi(p[1]);
@@ -3024,13 +3022,13 @@
 }
 
 void
-management_notify(struct management *man, const char *severity, const char *type, const char *text)
+management_notify(const char *severity, const char *type, const char *text)
 {
     msg(M_CLIENT, ">NOTIFY:%s,%s,%s", severity, type, text);
 }
 
 void
-management_notify_generic(struct management *man, const char *str)
+management_notify_generic(const char *str)
 {
     msg(M_CLIENT, "%s", str);
 }
@@ -3128,7 +3126,7 @@
 }
 
 void
-management_learn_addr(struct management *management, struct man_def_auth_context *mdac,
+management_learn_addr(struct man_def_auth_context *mdac,
                       const struct mroute_addr *addr, const bool primary)
 {
     struct gc_arena gc = gc_new();
@@ -3220,7 +3218,7 @@
 }
 
 void
-management_auth_token(struct management *man, const char *token)
+management_auth_token(const char *token)
 {
     msg(M_CLIENT, ">PASSWORD:Auth-Token:%s", token);
 }
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index 27d3b60..3ab937c 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -384,10 +384,10 @@
 
 void management_up_down(struct management *man, const char *updown, const struct env_set *es);
 
-void management_notify(struct management *man, const char *severity, const char *type,
+void management_notify(const char *severity, const char *type,
                        const char *text);
 
-void management_notify_generic(struct management *man, const char *str);
+void management_notify_generic(const char *str);
 
 void management_notify_client_needing_auth(struct management *management,
                                            const unsigned int auth_id,
@@ -400,7 +400,7 @@
 void management_notify_client_close(struct management *management,
                                     struct man_def_auth_context *mdac, const struct env_set *es);
 
-void management_learn_addr(struct management *management, struct man_def_auth_context *mdac,
+void management_learn_addr(struct man_def_auth_context *mdac,
                            const struct mroute_addr *addr, const bool primary);
 
 void management_notify_client_cr_response(unsigned mda_key_id,
@@ -487,7 +487,7 @@
 /*
  * Echo an authentication token to management interface
  */
-void management_auth_token(struct management *man, const char *token);
+void management_auth_token(const char *token);
 
 /*
  * These functions drive the bytecount in/out counters.
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 46ff1ba..3e72b92 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -1194,7 +1194,7 @@
 #ifdef ENABLE_MANAGEMENT
     if (management && owner)
     {
-        management_learn_addr(management, &mi->context.c2.mda_context, &addr, primary);
+        management_learn_addr(&mi->context.c2.mda_context, &addr, primary);
     }
 #endif
     if (primary && multi_check_push_ifconfig_extra_route(mi, addr.v4.addr))
@@ -1239,7 +1239,7 @@
 #ifdef ENABLE_MANAGEMENT
     if (management && owner)
     {
-        management_learn_addr(management, &mi->context.c2.mda_context, &addr, primary);
+        management_learn_addr(&mi->context.c2.mda_context, &addr, primary);
     }
 #endif
     if (primary && multi_check_push_ifconfig_ipv6_extra_route(mi, &addr.v6.addr))
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 7a649de..25a3746 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -7373,7 +7373,7 @@
 #ifdef ENABLE_MANAGEMENT
         if (management)
         {
-            management_auth_token(management, p[1]);
+            management_auth_token(p[1]);
         }
 #endif
     }
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index fa7bf1e..da2bb9f 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -179,7 +179,7 @@
 #ifdef ENABLE_MANAGEMENT
         if (management)
         {
-            management_notify(management, "info", c->sig->signal_text, m);
+            management_notify("info", c->sig->signal_text, m);
         }
 #endif
     }
@@ -215,7 +215,7 @@
 #ifdef ENABLE_MANAGEMENT
     if (management)
     {
-        management_notify(management, "info", "remote-exit", "EXIT");
+        management_notify("info", "remote-exit", "EXIT");
     }
 #endif
 }
@@ -245,7 +245,7 @@
         struct buffer out = alloc_buf_gc(256, &gc);
         if (buf_printf(&out, ">%s:%s", "INFOMSG", m))
         {
-            management_notify_generic(management, BSTR(&out));
+            management_notify_generic(BSTR(&out));
         }
         else
         {