diff --git a/client/js/lounge.js b/client/js/lounge.js
index 66a3d04f..0155feea 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -17,7 +17,6 @@ $(function() {
 		"/notice",
 		"/op",
 		"/part",
-		"/query",
 		"/quit",
 		"/raw",
 		"/say",
diff --git a/src/client.js b/src/client.js
index 9aea12c2..3663c28d 100644
--- a/src/client.js
+++ b/src/client.js
@@ -35,15 +35,12 @@ var events = [
 var inputs = [
 	// These inputs are sorted in order that is most likely to be used
 	"msg",
-	"whois",
 	"part",
 	"action",
 	"connect",
 	"invite",
-	"join",
 	"kick",
 	"mode",
-	"nick",
 	"notice",
 	"quit",
 	"raw",
diff --git a/src/plugins/inputs/join.js b/src/plugins/inputs/join.js
deleted file mode 100644
index 5ca98b4a..00000000
--- a/src/plugins/inputs/join.js
+++ /dev/null
@@ -1,10 +0,0 @@
-exports.commands = ["join"];
-
-exports.input = function(network, chan, cmd, args) {
-	if (args.length !== 0) {
-		var irc = network.irc;
-		irc.join(args[0], args[1]);
-	}
-
-	return true;
-};
diff --git a/src/plugins/inputs/nick.js b/src/plugins/inputs/nick.js
deleted file mode 100644
index 14f44dc9..00000000
--- a/src/plugins/inputs/nick.js
+++ /dev/null
@@ -1,10 +0,0 @@
-exports.commands = ["nick"];
-
-exports.input = function(network, chan, cmd, args) {
-	if (args.length !== 0) {
-		var irc = network.irc;
-		irc.nick(args[0]);
-	}
-
-	return true;
-};
diff --git a/src/plugins/inputs/whois.js b/src/plugins/inputs/whois.js
deleted file mode 100644
index f9b127d1..00000000
--- a/src/plugins/inputs/whois.js
+++ /dev/null
@@ -1,10 +0,0 @@
-exports.commands = ["query", "whois"];
-
-exports.input = function(network, chan, cmd, args) {
-	if (args.length !== 0) {
-		var irc = network.irc;
-		irc.whois(args[0]);
-	}
-
-	return true;
-};