diff --git a/commands/info/emoji-image.js b/commands/info/emoji-image.js
index a8939703..cea00f9a 100644
--- a/commands/info/emoji-image.js
+++ b/commands/info/emoji-image.js
@@ -14,7 +14,7 @@ module.exports = class EmojiImageCommand extends Command {
 				{
 					key: 'emoji',
 					prompt: 'Which emoji would you like to get the image of?',
-					type: 'emoji'
+					type: 'custom-emoji'
 				}
 			]
 		});
diff --git a/commands/info/emoji.js b/commands/info/emoji.js
index eb405900..f3eaf02e 100644
--- a/commands/info/emoji.js
+++ b/commands/info/emoji.js
@@ -16,7 +16,7 @@ module.exports = class EmojiCommand extends Command {
 				{
 					key: 'emoji',
 					prompt: 'Which emoji would you like to get information on?',
-					type: 'emoji'
+					type: 'custom-emoji'
 				}
 			]
 		});
diff --git a/types/emoji.js b/types/emoji.js
deleted file mode 100644
index 9cb07249..00000000
--- a/types/emoji.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const { ArgumentType, util: { disambiguation } } = require('discord.js-commando');
-const { escapeMarkdown } = require('discord.js');
-
-module.exports = class EmojiArgumentType extends ArgumentType {
-	constructor(client) {
-		super(client, 'emoji');
-	}
-
-	validate(value, msg) {
-		const matches = value.match(/^(?:<a?:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
-		if (matches && msg.client.emojis.has(matches[2])) return true;
-		if (!msg.guild) return false;
-		const search = value.toLowerCase();
-		let emojis = msg.guild.emojis.filter(nameFilterInexact(search));
-		if (!emojis.size) return false;
-		if (emojis.size === 1) return true;
-		const exactEmojis = emojis.filter(nameFilterExact(search));
-		if (exactEmojis.size === 1) return true;
-		if (exactEmojis.size > 0) emojis = exactEmojis;
-		return emojis.size <= 15
-			? `${disambiguation(emojis.map(emoji => escapeMarkdown(emoji.name)), 'emojis', null)}\n`
-			: 'Multiple emojis found. Please be more specific.';
-	}
-
-	parse(value, msg) {
-		const matches = value.match(/^(?:<a?:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
-		if (matches) return msg.client.emojis.get(matches[2]) || null;
-		const search = value.toLowerCase();
-		const emojis = msg.guild.emojis.filter(nameFilterInexact(search));
-		if (!emojis.size) return null;
-		if (emojis.size === 1) return emojis.first();
-		const exactEmojis = emojis.filter(nameFilterExact(search));
-		if (exactEmojis.size === 1) return exactEmojis.first();
-		return null;
-	}
-};
-
-function nameFilterExact(search) {
-	return thing => thing.name.toLowerCase() === search;
-}
-
-function nameFilterInexact(search) {
-	return thing => thing.name.toLowerCase().includes(search);
-}