diff --git a/modules/botserv/bs_bot.cpp b/modules/botserv/bs_bot.cpp
index 79092ca99..6349309fd 100644
--- a/modules/botserv/bs_bot.cpp
+++ b/modules/botserv/bs_bot.cpp
@@ -88,7 +88,6 @@ private:
 		source.Reply(_("%s!%s@%s (%s) added to the bot list."), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
 
 		FOREACH_MOD(OnBotCreate, (bi));
-		return;
 	}
 
 	void DoChange(CommandSource &source, const std::vector<Anope::string> &params)
@@ -227,7 +226,6 @@ private:
 		Log(LOG_ADMIN, source, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname;
 
 		FOREACH_MOD(OnBotChange, (bi));
-		return;
 	}
 
 	void DoDel(CommandSource &source, const std::vector<Anope::string> &params)
@@ -259,7 +257,6 @@ private:
 
 		source.Reply(_("Bot \002%s\002 has been deleted."), nick.c_str());
 		delete bi;
-		return;
 	}
 public:
 	CommandBSBot(Module *creator) : Command(creator, "botserv/bot", 1, 6)
@@ -339,8 +336,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/chanserv/cs_access.cpp b/modules/chanserv/cs_access.cpp
index ed81d4111..02b391b19 100644
--- a/modules/chanserv/cs_access.cpp
+++ b/modules/chanserv/cs_access.cpp
@@ -382,8 +382,6 @@ private:
 
 			source.Reply(_("\002%s\002 not found on %s access list."), mask.c_str(), ci->name.c_str());
 		}
-
-		return;
 	}
 
 	void ProcessList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params, ListFormatter &list)
@@ -439,8 +437,6 @@ private:
 			list.SendTo(source);
 			source.Reply(_("End of access list"));
 		}
-
-		return;
 	}
 
 	void DoList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
@@ -498,8 +494,6 @@ private:
 			bool override = !source.IsFounder(ci);
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to clear the access list";
 		}
-
-		return;
 	}
 
 public:
@@ -567,8 +561,6 @@ public:
 			this->DoClear(source, ci);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -765,7 +757,6 @@ class CommandCSLevels final
 		FOREACH_MOD(OnLevelChange, (source, ci, "ALL", 0));
 
 		source.Reply(_("Access levels for \002%s\002 reset to defaults."), ci->name.c_str());
-		return;
 	}
 
 public:
@@ -818,8 +809,6 @@ public:
 			this->DoReset(source, ci);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/chanserv/cs_akick.cpp b/modules/chanserv/cs_akick.cpp
index 077c2cd08..a2d30c3f5 100644
--- a/modules/chanserv/cs_akick.cpp
+++ b/modules/chanserv/cs_akick.cpp
@@ -499,8 +499,6 @@ public:
 			this->DoClear(source, ci);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/chanserv/cs_flags.cpp b/modules/chanserv/cs_flags.cpp
index bfd8433c4..7d04fa421 100644
--- a/modules/chanserv/cs_flags.cpp
+++ b/modules/chanserv/cs_flags.cpp
@@ -377,8 +377,6 @@ class CommandCSFlags final
 			bool override = !source.IsFounder(ci);
 			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to clear the access list";
 		}
-
-		return;
 	}
 
 public:
diff --git a/modules/chanserv/cs_list.cpp b/modules/chanserv/cs_list.cpp
index c2aa0d60d..d69dcb903 100644
--- a/modules/chanserv/cs_list.cpp
+++ b/modules/chanserv/cs_list.cpp
@@ -229,8 +229,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, "PRIVATE");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
diff --git a/modules/chanserv/cs_set.cpp b/modules/chanserv/cs_set.cpp
index 67670c29c..f03a9444a 100644
--- a/modules/chanserv/cs_set.cpp
+++ b/modules/chanserv/cs_set.cpp
@@ -253,8 +253,6 @@ public:
 			Log(source.AccessFor(ci).HasPriv("SET") ? LOG_COMMAND : LOG_OVERRIDE, source, this, ci) << "to unset the description";
 			source.Reply(_("Description of %s unset."), ci->name.c_str());
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
@@ -331,8 +329,6 @@ public:
 		ci->SetFounder(nc);
 
 		source.Reply(_("Founder of \002%s\002 changed to \002%s\002."), ci->name.c_str(), na->nick.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
@@ -465,8 +461,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, "PEACE");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
@@ -1004,8 +998,6 @@ public:
 			source.Reply(_("Successor for \002%s\002 changed to \002%s\002."), ci->name.c_str(), nc->display.c_str());
 		else
 			source.Reply(_("Successor for \002%s\002 unset."), ci->name.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
@@ -1084,8 +1076,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, "NOEXPIRE");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
diff --git a/modules/chanserv/cs_suspend.cpp b/modules/chanserv/cs_suspend.cpp
index 4ddf431ff..8286bcb83 100644
--- a/modules/chanserv/cs_suspend.cpp
+++ b/modules/chanserv/cs_suspend.cpp
@@ -195,8 +195,6 @@ public:
 		source.Reply(_("Channel \002%s\002 is now released."), ci->name.c_str());
 
 		FOREACH_MOD(OnChanUnsuspend, (ci));
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/help.cpp b/modules/help.cpp
index 6db0db372..74b55a608 100644
--- a/modules/help.cpp
+++ b/modules/help.cpp
@@ -183,8 +183,6 @@ public:
 		}
 
 		FOREACH_MOD(OnPostHelp, (source, params));
-
-		return;
 	}
 };
 
diff --git a/modules/hostserv/hs_group.cpp b/modules/hostserv/hs_group.cpp
index 8018e3a36..ec9d67b98 100644
--- a/modules/hostserv/hs_group.cpp
+++ b/modules/hostserv/hs_group.cpp
@@ -59,8 +59,6 @@ public:
 		}
 		else
 			source.Reply(HOST_NOT_ASSIGNED);
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/hostserv/hs_off.cpp b/modules/hostserv/hs_off.cpp
index a5528d4c7..81f2ab46f 100644
--- a/modules/hostserv/hs_off.cpp
+++ b/modules/hostserv/hs_off.cpp
@@ -39,8 +39,6 @@ public:
 			Log(LOG_COMMAND, source, this) << "to disable their vhost";
 			source.Reply(_("Your vhost was removed and the normal cloaking restored."));
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/hostserv/hs_on.cpp b/modules/hostserv/hs_on.cpp
index 33a077f32..55931cbb3 100644
--- a/modules/hostserv/hs_on.cpp
+++ b/modules/hostserv/hs_on.cpp
@@ -42,8 +42,6 @@ public:
 		}
 		else
 			source.Reply(HOST_NOT_ASSIGNED);
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_check.cpp b/modules/memoserv/ms_check.cpp
index 31efa70c3..221b12f20 100644
--- a/modules/memoserv/ms_check.cpp
+++ b/modules/memoserv/ms_check.cpp
@@ -59,8 +59,6 @@ public:
 
 		if (!found)
 			source.Reply(_("Nick %s doesn't have a memo from you."), na->nick.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_del.cpp b/modules/memoserv/ms_del.cpp
index d905a2e08..59462729d 100644
--- a/modules/memoserv/ms_del.cpp
+++ b/modules/memoserv/ms_del.cpp
@@ -121,7 +121,6 @@ public:
 					source.Reply(_("All of your memos have been deleted."));
 			}
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_ignore.cpp b/modules/memoserv/ms_ignore.cpp
index f81aca9d3..45fecf6a0 100644
--- a/modules/memoserv/ms_ignore.cpp
+++ b/modules/memoserv/ms_ignore.cpp
@@ -92,8 +92,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_list.cpp b/modules/memoserv/ms_list.cpp
index 619c84879..919b4523a 100644
--- a/modules/memoserv/ms_list.cpp
+++ b/modules/memoserv/ms_list.cpp
@@ -130,7 +130,6 @@ public:
 			source.Reply(_("Memos for %s:"), ci ? ci->name.c_str() : source.GetNick().c_str());
 			list.SendTo(source);
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_read.cpp b/modules/memoserv/ms_read.cpp
index e81a9cba0..de8a4eaba 100644
--- a/modules/memoserv/ms_read.cpp
+++ b/modules/memoserv/ms_read.cpp
@@ -191,7 +191,6 @@ public:
 				list.Process();
 			}
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/memoserv/ms_set.cpp b/modules/memoserv/ms_set.cpp
index fd0e7a0f4..9fa0db7b2 100644
--- a/modules/memoserv/ms_set.cpp
+++ b/modules/memoserv/ms_set.cpp
@@ -191,7 +191,6 @@ private:
 			else
 				source.Reply(_("Memo limit \002disabled\002 for %s."), !chan.empty() ? chan.c_str() : user.c_str());
 		}
-		return;
 	}
 public:
 	CommandMSSet(Module *creator) : Command(creator, "memoserv/set", 2, 5)
@@ -215,8 +214,6 @@ public:
 		{
 			this->OnSyntaxError(source, "");
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_confirm.cpp b/modules/nickserv/ns_confirm.cpp
index 325db3fcb..1e2f36c38 100644
--- a/modules/nickserv/ns_confirm.cpp
+++ b/modules/nickserv/ns_confirm.cpp
@@ -26,7 +26,6 @@ public:
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		this->OnSyntaxError(source, "");
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_email.cpp b/modules/nickserv/ns_email.cpp
index 4c6f9aca4..076363a2a 100644
--- a/modules/nickserv/ns_email.cpp
+++ b/modules/nickserv/ns_email.cpp
@@ -227,8 +227,6 @@ public:
 			source.Reply(_("No registrations matching \002%s\002 were found."), email.c_str());
 			return;
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_list.cpp b/modules/nickserv/ns_list.cpp
index 106ada32e..fd4c3f2ce 100644
--- a/modules/nickserv/ns_list.cpp
+++ b/modules/nickserv/ns_list.cpp
@@ -128,7 +128,6 @@ public:
 		source.Reply(_("List of entries matching \002%s\002:"), pattern.c_str());
 		list.SendTo(source);
 		source.Reply(_("End of list - %d/%d matches shown."), nnicks > listmax ? listmax : nnicks, nnicks);
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_logout.cpp b/modules/nickserv/ns_logout.cpp
index a5a6a2714..730fad723 100644
--- a/modules/nickserv/ns_logout.cpp
+++ b/modules/nickserv/ns_logout.cpp
@@ -57,7 +57,6 @@ public:
 			/* Send out an event */
 			FOREACH_MOD(OnNickLogout, (u2));
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp
index c3cc10934..7acb4651b 100644
--- a/modules/nickserv/ns_resetpass.cpp
+++ b/modules/nickserv/ns_resetpass.cpp
@@ -42,8 +42,6 @@ public:
 				source.Reply(_("Password reset email for \002%s\002 has been sent."), na->nick.c_str());
 			}
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp
index 8ee3404f5..0122649b6 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -24,7 +24,6 @@ public:
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		this->OnSyntaxError(source, "");
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -80,7 +79,6 @@ public:
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		this->OnSyntaxError(source, "");
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_akill.cpp b/modules/operserv/os_akill.cpp
index 06c21a9f8..dec402bad 100644
--- a/modules/operserv/os_akill.cpp
+++ b/modules/operserv/os_akill.cpp
@@ -267,8 +267,6 @@ private:
 
 		if (Anope::ReadOnly)
 			source.Reply(READ_ONLY_MODE);
-
-		return;
 	}
 
 	void ProcessList(CommandSource &source, const std::vector<Anope::string> &params, ListFormatter &list)
@@ -428,8 +426,6 @@ public:
 			return this->DoClear(source);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_chankill.cpp b/modules/operserv/os_chankill.cpp
index bed10c505..40d17eee3 100644
--- a/modules/operserv/os_chankill.cpp
+++ b/modules/operserv/os_chankill.cpp
@@ -89,7 +89,6 @@ public:
 			else
 				source.Reply(CHAN_X_NOT_IN_USE, channel.c_str());
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index eb14183de..f0a5a4c48 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -228,7 +228,6 @@ public:
 
 		/* Run any defcon functions, e.g. FORCE CHAN MODE */
 		runDefCon();
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp
index c2729bb73..f3a216a18 100644
--- a/modules/operserv/os_forbid.cpp
+++ b/modules/operserv/os_forbid.cpp
@@ -447,8 +447,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, command);
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_ignore.cpp b/modules/operserv/os_ignore.cpp
index 1bec9a1c9..2381fdfa7 100644
--- a/modules/operserv/os_ignore.cpp
+++ b/modules/operserv/os_ignore.cpp
@@ -346,8 +346,6 @@ private:
 		ignore_service->ClearIgnores();
 		Log(LOG_ADMIN, source, this) << "to CLEAR the list";
 		source.Reply(_("Ignore list has been cleared."));
-
-		return;
 	}
 
 public:
@@ -374,8 +372,6 @@ public:
 			return this->DoClear(source);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_list.cpp b/modules/operserv/os_list.cpp
index db1995f0a..4eec07bc6 100644
--- a/modules/operserv/os_list.cpp
+++ b/modules/operserv/os_list.cpp
@@ -248,7 +248,6 @@ public:
 
 		list.SendTo(source);
 		source.Reply(_("End of users list. \002%u\002 users shown."), count);
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_modinfo.cpp b/modules/operserv/os_modinfo.cpp
index 58ab596f3..4cf183907 100644
--- a/modules/operserv/os_modinfo.cpp
+++ b/modules/operserv/os_modinfo.cpp
@@ -56,8 +56,6 @@ public:
 		}
 		else
 			source.Reply(_("No information about module \002%s\002 is available."), file.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_module.cpp b/modules/operserv/os_module.cpp
index 2055f3cd9..e7e5602bf 100644
--- a/modules/operserv/os_module.cpp
+++ b/modules/operserv/os_module.cpp
@@ -35,8 +35,6 @@ public:
 			source.Reply(_("Module \002%s\002 is already loaded."), mname.c_str());
 		else
 			source.Reply(_("Unable to load module \002%s\002."), mname.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -108,8 +106,6 @@ public:
 			else
 				source.Reply(_("Unable to load module \002%s\002."), mname.c_str());
 		}
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -159,8 +155,6 @@ public:
 		}
 		else
 			source.Reply(_("Unable to remove module \002%s\002."), mname.c_str());
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_news.cpp b/modules/operserv/os_news.cpp
index 9badf188c..e3bba00ec 100644
--- a/modules/operserv/os_news.cpp
+++ b/modules/operserv/os_news.cpp
@@ -221,8 +221,6 @@ protected:
 			lflist.SendTo(source);
 			source.Reply(_("End of news list."));
 		}
-
-		return;
 	}
 
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params, NewsType ntype, const char **msgs)
@@ -247,8 +245,6 @@ protected:
 			source.Reply(msgs[MSG_ADDED]);
 			Log(LOG_ADMIN, source, this) << "to add a news item";
 		}
-
-		return;
 	}
 
 	void DoDel(CommandSource &source, const std::vector<Anope::string> &params, NewsType ntype, const char **msgs)
@@ -288,8 +284,6 @@ protected:
 				}
 			}
 		}
-
-		return;
 	}
 
 	void DoNews(CommandSource &source, const std::vector<Anope::string> &params, NewsType ntype)
@@ -311,8 +305,6 @@ protected:
 			return this->DoDel(source, params, ntype, msgs);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 public:
 	NewsBase(Module *creator, const Anope::string &newstype) : Command(creator, newstype, 1, 2), ns("NewsService", "news")
diff --git a/modules/operserv/os_oper.cpp b/modules/operserv/os_oper.cpp
index 2afe5c5f6..c0532d9e1 100644
--- a/modules/operserv/os_oper.cpp
+++ b/modules/operserv/os_oper.cpp
@@ -245,8 +245,6 @@ public:
 		}
 		else
 			this->OnSyntaxError(source, subcommand);
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp
index b4601ea00..da4236e44 100644
--- a/modules/operserv/os_session.cpp
+++ b/modules/operserv/os_session.cpp
@@ -252,8 +252,6 @@ private:
 			source.Reply(_("Hosts with at least \002%d\002 sessions:"), mincount);
 			list.SendTo(source);
 		}
-
-		return;
 	}
 
 	static void DoView(CommandSource &source, const std::vector<Anope::string> &params)
@@ -421,8 +419,6 @@ private:
 					source.Reply(READ_ONLY_MODE);
 			}
 		}
-
-		return;
 	}
 
 	void DoDel(CommandSource &source, const std::vector<Anope::string> &params)
@@ -457,8 +453,6 @@ private:
 
 		if (Anope::ReadOnly)
 			source.Reply(READ_ONLY_MODE);
-
-		return;
 	}
 
 	void ProcessList(CommandSource &source, const std::vector<Anope::string> &params, ListFormatter &list)
diff --git a/modules/operserv/os_set.cpp b/modules/operserv/os_set.cpp
index 5eefebe4d..456622d5e 100644
--- a/modules/operserv/os_set.cpp
+++ b/modules/operserv/os_set.cpp
@@ -27,8 +27,6 @@ private:
 		source.Reply(index.c_str(), "DEBUG");
 		index = Anope::NoExpire ? _("%s is enabled") : _("%s is disabled");
 		source.Reply(index.c_str(), "NOEXPIRE");
-
-		return;
 	}
 
 	void DoSetReadOnly(CommandSource &source, const std::vector<Anope::string> &params)
@@ -55,8 +53,6 @@ private:
 		}
 		else
 			source.Reply(_("Setting for READONLY must be \002ON\002 or \002OFF\002."));
-
-		return;
 	}
 
 	void DoSetSuperAdmin(CommandSource &source, const std::vector<Anope::string> &params)
@@ -94,8 +90,6 @@ private:
 		}
 		else
 			source.Reply(_("Setting for super admin must be \002ON\002 or \002OFF\002."));
-
-		return;
 	}
 
 	void DoSetDebug(CommandSource &source, const std::vector<Anope::string> &params)
@@ -133,8 +127,6 @@ private:
 
 			source.Reply(_("Setting for DEBUG must be \002ON\002, \002OFF\002, or a positive number."));
 		}
-
-		return;
 	}
 
 	void DoSetNoExpire(CommandSource &source, const std::vector<Anope::string> &params)
@@ -161,8 +153,6 @@ private:
 		}
 		else
 			source.Reply(_("Setting for NOEXPIRE must be \002ON\002 or \002OFF\002."));
-
-		return;
 	}
 public:
 	CommandOSSet(Module *creator) : Command(creator, "operserv/set", 1, 2)
@@ -187,8 +177,6 @@ public:
 			return this->DoSetSuperAdmin(source, params);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_shutdown.cpp b/modules/operserv/os_shutdown.cpp
index 6d7b778ae..2e16bb06d 100644
--- a/modules/operserv/os_shutdown.cpp
+++ b/modules/operserv/os_shutdown.cpp
@@ -47,7 +47,6 @@ public:
 		Log(LOG_ADMIN, source, this);
 		Anope::QuitReason = source.command + " command received from " + source.GetNick();
 		Anope::Quitting = true;
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -84,7 +83,6 @@ public:
 		Anope::QuitReason = source.command + " command received from " + source.GetNick();
 		Anope::Quitting = Anope::Restarting = true;
 		Anope::SaveDatabases();
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -118,7 +116,6 @@ public:
 		Anope::QuitReason = source.command + " command received from " + source.GetNick();
 		Anope::Quitting = true;
 		Anope::SaveDatabases();
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_stats.cpp b/modules/operserv/os_stats.cpp
index fd80c55b7..0cd46280a 100644
--- a/modules/operserv/os_stats.cpp
+++ b/modules/operserv/os_stats.cpp
@@ -124,7 +124,6 @@ private:
 		MaxUserTime = Anope::CurTime;
 		Stats::me->QueueUpdate();
 		source.Reply(_("Statistics reset."));
-		return;
 	}
 
 	static void DoStatsUptime(CommandSource &source)
@@ -133,8 +132,6 @@ private:
 		source.Reply(_("Current users: \002%zu\002 (\002%zu\002 ops)"), UserListByNick.size(), OperCount);
 		source.Reply(_("Maximum users: \002%zu\002 (%s)"), MaxUserCount, Anope::strftime(MaxUserTime, source.GetAccount()).c_str());
 		source.Reply(_("Services up %s."), Anope::Duration(uptime, source.GetAccount()).c_str());
-
-		return;
 	}
 
 	static void DoStatsUplink(CommandSource &source)
@@ -148,7 +145,6 @@ private:
 		source.Reply(_("Uplink server: %s"), Me->GetLinks().front()->GetName().c_str());
 		source.Reply(_("Uplink capab: %s"), buf.c_str());
 		source.Reply(_("Servers found: %zu"), Servers::ByName.size() - 1);
-		return;
 	}
 
 	template<typename T> void GetHashStats(const T &map, size_t &entries, size_t &buckets, size_t &max_chain)
diff --git a/modules/operserv/os_svs.cpp b/modules/operserv/os_svs.cpp
index 1d6077aca..5ab91352c 100644
--- a/modules/operserv/os_svs.cpp
+++ b/modules/operserv/os_svs.cpp
@@ -59,7 +59,6 @@ public:
 			Log(LOG_ADMIN, source, this) << "to change " << nick << " to " << newnick;
 			IRCD->SendForceNickChange(u2, newnick, Anope::CurTime);
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/operserv/os_sxline.cpp b/modules/operserv/os_sxline.cpp
index c9e06bac6..29b10eab1 100644
--- a/modules/operserv/os_sxline.cpp
+++ b/modules/operserv/os_sxline.cpp
@@ -114,8 +114,6 @@ private:
 
 		if (Anope::ReadOnly)
 			source.Reply(READ_ONLY_MODE);
-
-		return;
 	}
 
 	void ProcessList(CommandSource &source, const std::vector<Anope::string> &params, ListFormatter &list)
@@ -238,8 +236,6 @@ private:
 		source.Reply(_("The %s list has been cleared."), source.command.nobreak().c_str());
 		if (Anope::ReadOnly)
 			source.Reply(READ_ONLY_MODE);
-
-		return;
 	}
 public:
 	CommandOSSXLineBase(Module *creator, const Anope::string &cmd) : Command(creator, cmd, 1, 4)
@@ -267,8 +263,6 @@ public:
 			return this->OnClear(source);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0;
diff --git a/modules/operserv/os_update.cpp b/modules/operserv/os_update.cpp
index 0be8e2675..2297297ca 100644
--- a/modules/operserv/os_update.cpp
+++ b/modules/operserv/os_update.cpp
@@ -25,7 +25,6 @@ public:
 		Log(LOG_ADMIN, source, this);
 		source.Reply(_("Updating databases."));
 		Anope::SaveDatabases();
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 989cfcbc6..24ff3a94e 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -257,8 +257,6 @@ struct IRCDMessageEncap final
 			m.data.assign(params.begin() + 5, params.end());
 			SASL::service->ProcessMessage(m);
 		}
-
-		return;
 	}
 };
 
diff --git a/modules/sql_authentication.cpp b/modules/sql_authentication.cpp
index c2cf2e9d0..c0a6ea8e5 100644
--- a/modules/sql_authentication.cpp
+++ b/modules/sql_authentication.cpp
@@ -27,7 +27,6 @@ class SQLAuthenticationResult final
 	{
 		Log(LOG_DEBUG) << "sql_authentication: Unsuccessful authentication for " << req->GetAccount() << ": " << reason;
 		delete this;
-		return;
 	}
 
 public: