diff --git a/commands/images/fetish.js b/commands/images/fetish.js
index 28186fe..20267b4 100644
--- a/commands/images/fetish.js
+++ b/commands/images/fetish.js
@@ -13,31 +13,18 @@ module.exports = class fetishCommand extends Command {
             group: 'images',
             memberName: 'fetish',
             description: `My fetish`,
-            args: [
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
-                }
-            ]
         });
     }
 
-    async run(message, { user }) {
-//  Check if user is blacklisted
+    async run(message) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
-
         let Attachment = (message.attachments).array();
         let image = null
-        
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url
 
diff --git a/commands/images/god.js b/commands/images/god.js
index 9f72237..1b92dfb 100644
--- a/commands/images/god.js
+++ b/commands/images/god.js
@@ -13,29 +13,18 @@ module.exports = class godCommand extends Command {
             group: 'images',
             memberName: 'god',
             description: `Retweet if you aren't afraid to have a picture of god on your timeline`,
-            args: [
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
-                }
-            ]
         });
     }
 
-    async run(message, { user }) {
+    async run(message) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url
 
diff --git a/commands/images/human.js b/commands/images/human.js
index f2b649e..579cdb5 100644
--- a/commands/images/human.js
+++ b/commands/images/human.js
@@ -13,28 +13,18 @@ module.exports = class humanCommand extends Command {
             group: 'images',
             memberName: 'human',
             description: `HUMAN ?! YOU DARE CALL THAT THING HUMAN?!?!`,
-            args: [
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
-                }
-            ]
         });
     }
 
-    async run(message, { user }) {
+    async run(message) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url
         
diff --git a/commands/images/idubbbz.js b/commands/images/idubbbz.js
index df51e08..6e56874 100644
--- a/commands/images/idubbbz.js
+++ b/commands/images/idubbbz.js
@@ -20,30 +20,22 @@ module.exports = class idubbbzCommand extends Command {
                     prompt: 'What do you the paper to say?',
                     type: 'string',
                     default: 'Nigger Faggot'
-                },
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
                 }
             ]
         });
     }
 
-    async run(message, { text, user }) {
+    async run(message, { text }) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
-        else 
-        image = Attachment[0].url
+        if (!Attachment[0])
+        image = message.author.displayAvatarURL
+    else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+        return message.say('Gif dosent work, sorry')
+    else 
+    image = Attachment[0].url
 
             const canvas = createCanvas(1281, 627)
             const applyText = (canvas, text) => {
diff --git a/commands/images/idubbbzpaint.js b/commands/images/idubbbzpaint.js
index 3936b79..a1d4cb8 100644
--- a/commands/images/idubbbzpaint.js
+++ b/commands/images/idubbbzpaint.js
@@ -20,28 +20,20 @@ module.exports = class idubbbzpaintCommand extends Command {
                     prompt: 'What do you the paper to say?',
                     type: 'string',
                     default: 'Perfection'
-                },
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
                 }
             ]
         });
     }
 
-    async run(message, { text, user }) {
+    async run(message, { text }) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url
 
diff --git a/commands/images/like.js b/commands/images/like.js
index 14ba190..b73f923 100644
--- a/commands/images/like.js
+++ b/commands/images/like.js
@@ -13,28 +13,18 @@ module.exports = class likeCommand extends Command {
             group: 'images',
             memberName: 'like',
             description: `What the hell is this and why did my grandsone like it`,
-            args: [
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
-                }
-            ]
         });
     }
 
-    async run(message, { user }) {
+    async run(message) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url
 
diff --git a/commands/images/ugly.js b/commands/images/ugly.js
index 4a32a5c..0bbf866 100644
--- a/commands/images/ugly.js
+++ b/commands/images/ugly.js
@@ -13,28 +13,18 @@ module.exports = class uglyCommand extends Command {
             group: 'images',
             memberName: 'ugly',
             description: `You are very ugly!`,
-            args: [
-                {
-                    key: 'user',
-                    prompt: 'What do you want me to say',
-                    type: 'user',
-                    default: ''
-                }
-            ]
         });
     }
 
-    async run(message, { user }) {
+    async run(message) {
         if(blacklist[message.author.id])
         return message.channel.send("You are blacklisted")
         let Attachment = (message.attachments).array();
         let image = null
-        if (!Attachment[0] && !user)
-            image = message.author.displayAvatarURL;
-        else if (!Attachment[0])
-            image = user.displayAvatarURL;
-        else if(Attachment[0].url.endsWith('gif'))
-            return message.say('Gif dosent work, sorry');
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else if(Attachment[0] && Attachment[0].url.endsWith('gif'))
+            return message.say('Gif dosent work, sorry')
         else 
         image = Attachment[0].url