5 files changed, 4 insertions, 22 deletions
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 80d2c4749..c6d2f8225 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -189,10 +189,7 @@ public:
 	}
 	void ChanServHelp(User *u)
 	{
-		if (!CSListOpersOnly || (is_oper(u)))
-		{
-			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
-		}
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
 	}
 };
 
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 77fcdbd16..f32a3460f 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -223,8 +223,7 @@ class NSList : public Module
 	}
 	void NickServHelp(User *u)
 	{
-		if (!NSListOpersOnly || is_oper(u))
-			notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
 	}
 };
 
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index d2e6b0daf..970b37c49 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -39,9 +39,6 @@ class CommandOSQuit : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		if (!u->nc->HasCommand("operserv/quit"))
-			return false;
-
 		notice_help(s_OperServ, u, OPER_HELP_QUIT);
 		return true;
 	}
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 05697ac37..540d3121c 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -40,9 +40,6 @@ class CommandOSShutdown : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		if (!u->nc->HasCommand("operserv/shutdown"))
-			return false;
-
 		notice_help(s_OperServ, u, OPER_HELP_SHUTDOWN);
 		return true;
 	}
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index c839e8635..10bf6a557 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -125,9 +125,6 @@ class CommandNSOInfo : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		if (!is_oper(u))
-			return false;
-
 		me->NoticeLang(s_NickServ, u, OINFO_HELP);
 		return true;
 	}
@@ -202,9 +199,6 @@ class CommandCSOInfo : public Command
 
 	bool OnHelp(User *u, const ci::string &subcommand)
 	{
-		if (!is_oper(u))
-			return false;
-
 		me->NoticeLang(s_ChanServ, u, OCINFO_HELP);
 		return true;
 	}
@@ -611,14 +605,12 @@ class OSInfo : public Module
 
 	void NickServHelp(User *u)
 	{
-		if (is_oper(u))
-			this->NoticeLang(s_NickServ, u, OINFO_HELP_CMD);
+		this->NoticeLang(s_NickServ, u, OINFO_HELP_CMD);
 	}
 
 	void ChanServHelp(User *u)
 	{
-		if (is_oper(u))
-			this->NoticeLang(s_ChanServ, u, OCINFO_HELP_CMD);
+		this->NoticeLang(s_ChanServ, u, OCINFO_HELP_CMD);
 	}
 };