56 files changed, 6 insertions, 14 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index ebe4391b3..fd30cbb08 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -145,7 +145,6 @@ install: target@EXTRA_DIR@
 	@-install -d -m $(INSTMODE) $(BINPATH)
 	@-install -d -m $(INSTMODE) $(CONPATH)
 	@-install -d -m $(INSTMODE) $(MODPATH)
-	-install -m $(INSTMODE) src/commands/*.so $(MODPATH)
 	-install -m $(INSTMODE) src/modules/*.so $(MODPATH)
 	-install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null
 	-install -m $(INSTMODE) src/inspircd $(BINPATH)
@@ -163,7 +162,7 @@ install: target@EXTRA_DIR@
 clean:
 	@echo Cleaning...
 	@rm -f src/inspircd src/modes/modeclasses.a
-	@rm -f src/*.so src/modules/*.so src/commands/*.so src/modules/*/*.so
+	@rm -f src/*.so src/modules/*.so src/modules/*/*.so
 	@rm -f src/*.o src/*/*.o src/modules/*/*.o
 	@rm -f src/.*.d src/*/.*.d src/modules/*/.*.d
 	@echo Completed.
@@ -181,7 +180,6 @@ launchd_dir:
 configureclean:
 	rm -f .config.cache
 	rm -f src/modules/Makefile
-	rm -f src/commands/Makefile
 	rm -f src/Makefile
 	-rm -f Makefile
 	rm -f BSDmakefile
@@ -211,7 +209,7 @@ help:
 	@echo ' M=m_foo   Builds a single module'
 	@echo ' T=target  Builds a user-specified target'
 	@echo '           Target can be a file path relative to src/, or one of:'
-	@echo '            inspircd  commands  modules'
+	@echo '            inspircd  modules'
 	@echo '           Multiple targets may be separated by a space'
 	@echo ''
 	@echo ' clean     Cleans object files produced by the compile'
diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index 13cb2cce8..1ea3e2916 100644
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -1,6 +1,5 @@
 VPATH = $(SOURCEPATH)/src
 CORE_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.o/, <*.cpp>, <modes/*.cpp>'
-CMD_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.so/, <commands/*.cpp>'
 MOD_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.so/, <modules/*.cpp>'
 MDIR_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s!/?$$!.so!, grep -d, <modules/m_*>'
 
@@ -8,9 +7,7 @@ CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread
 
 DFILES != perl $(SOURCEPATH)/make/calcdep.pl -all
 
-all: inspircd commands modules
-
-commands: $(CMD_TARGS)
+all: inspircd modules
 
 modules: $(MOD_TARGS) $(MDIR_TARGS)
 
diff --git a/make/calcdep.pl b/make/calcdep.pl
index 261b6ec18..d8b4e292b 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -51,7 +51,7 @@ sub dep_cpp {
 	my($file, $dfile) = @_;
 	gendep $file;
 	my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
-	my $ext = $path eq 'modules/' || $path eq 'commands/' ? '.so' : '.o';
+	my $ext = $path eq 'modules/' ? '.so' : '.o';
 	my $out = "$path$base$ext";
 	$dfile = "$baseout/$path.$base.d" unless defined $dfile;
 
diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index 338a5112d..ea9843574 100644
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -1,7 +1,6 @@
 SRC = $(SOURCEPATH)/src
 VPATH = $(SRC)
 CORE_TARGS = $(patsubst $(SRC)/%.cpp,%.o,$(wildcard $(SRC)/*.cpp $(SRC)/modes/*.cpp))
-CMD_TARGS = $(patsubst $(SRC)/%.cpp,%.so,$(wildcard $(SRC)/commands/*.cpp))
 MOD_TARGS = $(patsubst $(SRC)/%.cpp,%.so,$(wildcard $(SRC)/modules/*.cpp))
 
 CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
@@ -9,15 +8,13 @@ MOD_TARGS += $(shell perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", gre
 
 DFILES = $(shell perl $(SOURCEPATH)/make/calcdep.pl -all)
 
-all: inspircd commands modules
-
-commands: $(CMD_TARGS)
+all: inspircd modules
 
 modules: $(MOD_TARGS)
 
 inspircd: $(CORE_TARGS)
 	$(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $^
 
-.PHONY: all alldep commands modules
+.PHONY: all alldep modules
 
 -include $(DFILES)
diff --git a/src/commands/cmd_admin.cpp b/src/modules/cmd_admin.cpp
index 1f2641e67..1f2641e67 100644
--- a/src/commands/cmd_admin.cpp
+++ b/src/modules/cmd_admin.cpp
diff --git a/src/commands/cmd_away.cpp b/src/modules/cmd_away.cpp
index d93f74559..d93f74559 100644
--- a/src/commands/cmd_away.cpp
+++ b/src/modules/cmd_away.cpp
diff --git a/src/commands/cmd_clearcache.cpp b/src/modules/cmd_clearcache.cpp
index 2334e597c..2334e597c 100644
--- a/src/commands/cmd_clearcache.cpp
+++ b/src/modules/cmd_clearcache.cpp
diff --git a/src/commands/cmd_commands.cpp b/src/modules/cmd_commands.cpp
index 63b4b24fb..63b4b24fb 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/modules/cmd_commands.cpp
diff --git a/src/commands/cmd_connect.cpp b/src/modules/cmd_connect.cpp
index 65cc4bd6b..65cc4bd6b 100644
--- a/src/commands/cmd_connect.cpp
+++ b/src/modules/cmd_connect.cpp
diff --git a/src/commands/cmd_die.cpp b/src/modules/cmd_die.cpp
index 658240de8..658240de8 100644
--- a/src/commands/cmd_die.cpp
+++ b/src/modules/cmd_die.cpp
diff --git a/src/commands/cmd_eline.cpp b/src/modules/cmd_eline.cpp
index 7845fa2f1..7845fa2f1 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/modules/cmd_eline.cpp
diff --git a/src/commands/cmd_gline.cpp b/src/modules/cmd_gline.cpp
index ad3067428..ad3067428 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/modules/cmd_gline.cpp
diff --git a/src/commands/cmd_info.cpp b/src/modules/cmd_info.cpp
index f239b9f78..f239b9f78 100644
--- a/src/commands/cmd_info.cpp
+++ b/src/modules/cmd_info.cpp
diff --git a/src/commands/cmd_invite.cpp b/src/modules/cmd_invite.cpp
index 89437e252..89437e252 100644
--- a/src/commands/cmd_invite.cpp
+++ b/src/modules/cmd_invite.cpp
diff --git a/src/commands/cmd_ison.cpp b/src/modules/cmd_ison.cpp
index ca7639b58..ca7639b58 100644
--- a/src/commands/cmd_ison.cpp
+++ b/src/modules/cmd_ison.cpp
diff --git a/src/commands/cmd_join.cpp b/src/modules/cmd_join.cpp
index 73cae4746..73cae4746 100644
--- a/src/commands/cmd_join.cpp
+++ b/src/modules/cmd_join.cpp
diff --git a/src/commands/cmd_kick.cpp b/src/modules/cmd_kick.cpp
index d07d53836..d07d53836 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/modules/cmd_kick.cpp
diff --git a/src/commands/cmd_kill.cpp b/src/modules/cmd_kill.cpp
index 1001d4c8a..1001d4c8a 100644
--- a/src/commands/cmd_kill.cpp
+++ b/src/modules/cmd_kill.cpp
diff --git a/src/commands/cmd_kline.cpp b/src/modules/cmd_kline.cpp
index 3ec2461b4..3ec2461b4 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/modules/cmd_kline.cpp
diff --git a/src/commands/cmd_links.cpp b/src/modules/cmd_links.cpp
index d722fa65d..d722fa65d 100644
--- a/src/commands/cmd_links.cpp
+++ b/src/modules/cmd_links.cpp
diff --git a/src/commands/cmd_list.cpp b/src/modules/cmd_list.cpp
index b7023072b..b7023072b 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/modules/cmd_list.cpp
diff --git a/src/commands/cmd_loadmodule.cpp b/src/modules/cmd_loadmodule.cpp
index d4cda20ab..d4cda20ab 100644
--- a/src/commands/cmd_loadmodule.cpp
+++ b/src/modules/cmd_loadmodule.cpp
diff --git a/src/commands/cmd_lusers.cpp b/src/modules/cmd_lusers.cpp
index a79466ae4..a79466ae4 100644
--- a/src/commands/cmd_lusers.cpp
+++ b/src/modules/cmd_lusers.cpp
diff --git a/src/commands/cmd_map.cpp b/src/modules/cmd_map.cpp
index edc8aa124..edc8aa124 100644
--- a/src/commands/cmd_map.cpp
+++ b/src/modules/cmd_map.cpp
diff --git a/src/commands/cmd_mode.cpp b/src/modules/cmd_mode.cpp
index 3cfc58263..3cfc58263 100644
--- a/src/commands/cmd_mode.cpp
+++ b/src/modules/cmd_mode.cpp
diff --git a/src/commands/cmd_modules.cpp b/src/modules/cmd_modules.cpp
index 599eb611b..599eb611b 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/modules/cmd_modules.cpp
diff --git a/src/commands/cmd_motd.cpp b/src/modules/cmd_motd.cpp
index 0e0785e93..0e0785e93 100644
--- a/src/commands/cmd_motd.cpp
+++ b/src/modules/cmd_motd.cpp
diff --git a/src/commands/cmd_names.cpp b/src/modules/cmd_names.cpp
index 537c477c8..537c477c8 100644
--- a/src/commands/cmd_names.cpp
+++ b/src/modules/cmd_names.cpp
diff --git a/src/commands/cmd_nick.cpp b/src/modules/cmd_nick.cpp
index 99b8348ab..99b8348ab 100644
--- a/src/commands/cmd_nick.cpp
+++ b/src/modules/cmd_nick.cpp
diff --git a/src/commands/cmd_notice.cpp b/src/modules/cmd_notice.cpp
index ced17072f..ced17072f 100644
--- a/src/commands/cmd_notice.cpp
+++ b/src/modules/cmd_notice.cpp
diff --git a/src/commands/cmd_oper.cpp b/src/modules/cmd_oper.cpp
index da53d2b1a..da53d2b1a 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/modules/cmd_oper.cpp
diff --git a/src/commands/cmd_part.cpp b/src/modules/cmd_part.cpp
index e2e4e59a0..e2e4e59a0 100644
--- a/src/commands/cmd_part.cpp
+++ b/src/modules/cmd_part.cpp
diff --git a/src/commands/cmd_pass.cpp b/src/modules/cmd_pass.cpp
index 6219118ee..6219118ee 100644
--- a/src/commands/cmd_pass.cpp
+++ b/src/modules/cmd_pass.cpp
diff --git a/src/commands/cmd_ping.cpp b/src/modules/cmd_ping.cpp
index e7898921a..e7898921a 100644
--- a/src/commands/cmd_ping.cpp
+++ b/src/modules/cmd_ping.cpp
diff --git a/src/commands/cmd_pong.cpp b/src/modules/cmd_pong.cpp
index 225be147a..225be147a 100644
--- a/src/commands/cmd_pong.cpp
+++ b/src/modules/cmd_pong.cpp
diff --git a/src/commands/cmd_privmsg.cpp b/src/modules/cmd_privmsg.cpp
index 781ad8bac..781ad8bac 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/modules/cmd_privmsg.cpp
diff --git a/src/commands/cmd_qline.cpp b/src/modules/cmd_qline.cpp
index ffe8c5ee6..ffe8c5ee6 100644
--- a/src/commands/cmd_qline.cpp
+++ b/src/modules/cmd_qline.cpp
diff --git a/src/commands/cmd_quit.cpp b/src/modules/cmd_quit.cpp
index d041fc031..d041fc031 100644
--- a/src/commands/cmd_quit.cpp
+++ b/src/modules/cmd_quit.cpp
diff --git a/src/commands/cmd_rehash.cpp b/src/modules/cmd_rehash.cpp
index a689801aa..a689801aa 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/modules/cmd_rehash.cpp
diff --git a/src/commands/cmd_reloadmodule.cpp b/src/modules/cmd_reloadmodule.cpp
index 3e3a3a617..3e3a3a617 100644
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/modules/cmd_reloadmodule.cpp
diff --git a/src/commands/cmd_restart.cpp b/src/modules/cmd_restart.cpp
index e83f3f381..e83f3f381 100644
--- a/src/commands/cmd_restart.cpp
+++ b/src/modules/cmd_restart.cpp
diff --git a/src/commands/cmd_rules.cpp b/src/modules/cmd_rules.cpp
index 3cc5c15f4..3cc5c15f4 100644
--- a/src/commands/cmd_rules.cpp
+++ b/src/modules/cmd_rules.cpp
diff --git a/src/commands/cmd_server.cpp b/src/modules/cmd_server.cpp
index e5a7622b8..e5a7622b8 100644
--- a/src/commands/cmd_server.cpp
+++ b/src/modules/cmd_server.cpp
diff --git a/src/commands/cmd_squit.cpp b/src/modules/cmd_squit.cpp
index f742dd964..f742dd964 100644
--- a/src/commands/cmd_squit.cpp
+++ b/src/modules/cmd_squit.cpp
diff --git a/src/commands/cmd_stats.cpp b/src/modules/cmd_stats.cpp
index 7ffa4a93c..7ffa4a93c 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/modules/cmd_stats.cpp
diff --git a/src/commands/cmd_time.cpp b/src/modules/cmd_time.cpp
index 8ff588c2d..8ff588c2d 100644
--- a/src/commands/cmd_time.cpp
+++ b/src/modules/cmd_time.cpp
diff --git a/src/commands/cmd_topic.cpp b/src/modules/cmd_topic.cpp
index e0fa79d1c..e0fa79d1c 100644
--- a/src/commands/cmd_topic.cpp
+++ b/src/modules/cmd_topic.cpp
diff --git a/src/commands/cmd_unloadmodule.cpp b/src/modules/cmd_unloadmodule.cpp
index bdc516aac..bdc516aac 100644
--- a/src/commands/cmd_unloadmodule.cpp
+++ b/src/modules/cmd_unloadmodule.cpp
diff --git a/src/commands/cmd_user.cpp b/src/modules/cmd_user.cpp
index e2f81f33c..e2f81f33c 100644
--- a/src/commands/cmd_user.cpp
+++ b/src/modules/cmd_user.cpp
diff --git a/src/commands/cmd_userhost.cpp b/src/modules/cmd_userhost.cpp
index 2833d56ba..2833d56ba 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/modules/cmd_userhost.cpp
diff --git a/src/commands/cmd_version.cpp b/src/modules/cmd_version.cpp
index bfe82d4d9..bfe82d4d9 100644
--- a/src/commands/cmd_version.cpp
+++ b/src/modules/cmd_version.cpp
diff --git a/src/commands/cmd_wallops.cpp b/src/modules/cmd_wallops.cpp
index 7894419c1..7894419c1 100644
--- a/src/commands/cmd_wallops.cpp
+++ b/src/modules/cmd_wallops.cpp
diff --git a/src/commands/cmd_who.cpp b/src/modules/cmd_who.cpp
index 89ca60d02..89ca60d02 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/modules/cmd_who.cpp
diff --git a/src/commands/cmd_whois.cpp b/src/modules/cmd_whois.cpp
index 972b0439e..972b0439e 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/modules/cmd_whois.cpp
diff --git a/src/commands/cmd_whowas.cpp b/src/modules/cmd_whowas.cpp
index 78a7e7544..78a7e7544 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/modules/cmd_whowas.cpp
diff --git a/src/commands/cmd_zline.cpp b/src/modules/cmd_zline.cpp
index e2cca7649..e2cca7649 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/modules/cmd_zline.cpp