diff --git a/Commands/HelpCommand.js b/Commands/HelpCommand.js
index 3dd64be8..d2d6c122 100644
--- a/Commands/HelpCommand.js
+++ b/Commands/HelpCommand.js
@@ -12,12 +12,9 @@ var helpFileResponsesObjectMethod = function(client) {
         if(message.content.toLowerCase() === cmdHelp) {
             message.author.createDM(message.author.send(helpFile));
         };
-        if(message.content.toLowerCase() === cmdHelp) {
+        if(message.content.toLowerCase() === cmdHelp + 'test') {
             message.author.createDM(message.author.send('this is a TEST'));
         };
-    });
-    
-    client.on('message', message => {
         if (message.isMemberMentioned(waldyBot) === true) { 
             message.author.createDM(message.author.send(helpFile));
         };
diff --git a/Commands/SetupCommand.js b/Commands/SetupCommand.js
index b198b8ba..0477ae0c 100644
--- a/Commands/SetupCommand.js
+++ b/Commands/SetupCommand.js
@@ -12,13 +12,9 @@ var setUpResponsesMethod = function(client) {
         if(message.content.toLowerCase() === cmdSetUp) {
             message.author.createDM(message.author.send(waldyBotAuthUrl));
         }
-    });
-    client.on('message', message => {
         if(message.content.toLowerCase() === cmdSetUp + ' ' + 'help') {
             message.author.createDM(message.author.send(setUpFile));
         }
-    });
-    client.on('message', message => {
         if(message.content.toLowerCase() === cmdSetUp + ' ' + 'install') {
             message.author.createDM(message.author.send(waldyBotAuthUrl));
         }