diff --git a/commands/botinfo/info.js b/commands/botinfo/info.js
index 687ed105..d7798449 100644
--- a/commands/botinfo/info.js
+++ b/commands/botinfo/info.js
@@ -61,7 +61,7 @@ module.exports = class InfoCommand extends commando.Command {
                 .addField('Utility Modules',
                 "[superagent](https://github.com/visionmedia/superagent), [mathjs](http://mathjs.org/), [moment](http://momentjs.com), [moment-duration-format](https://github.com/jsmreese/moment-duration-format), [opusscript](https://github.com/abalabahaha/opusscript), [jimp](https://github.com/oliver-moran/jimp)")
                 .addField('APIs',
-                "[Cleverbot API](https://www.cleverbot.com/api/), [Wattpad API](https://developer.wattpad.com/docs/api), [Wordnik API](http://developer.wordnik.com/docs.html), [osu! API](https://osu.ppy.sh/p/api), [memegen.link](https://memegen.link/), [Yugioh Prices API](http://docs.yugiohprices.apiary.io/#), [YouTube Data API](https://developers.google.com/youtube/v3/), [Yoda Speak API](https://market.mashape.com/ismaelc/yoda-speak), [Discord Bots API](https://bots.discord.pw/api), [Today in History API](http://history.muffinlabs.com/)")
+                "[Cleverbot API](https://www.cleverbot.com/api/), [Wattpad API](https://developer.wattpad.com/docs/api), [Wordnik API](http://developer.wordnik.com/docs.html), [osu! API](https://osu.ppy.sh/p/api), [memegen.link](https://memegen.link/), [Yugioh Prices API](http://docs.yugiohprices.apiary.io/#), [YouTube Data API](https://developers.google.com/youtube/v3/), [Yoda Speak API](https://market.mashape.com/ismaelc/yoda-speak), [Discord Bots API](https://bots.discord.pw/api)")
                 .addField('Other Credit',
                 "[Heroku](https://www.heroku.com/), [Cloud9](https://c9.io/), [heroku-buildpack-ffmpeg-latest](https://elements.heroku.com/buildpacks/jonathanong/heroku-buildpack-ffmpeg-latest)")
                 .addField('My Server',
diff --git a/commands/random/today.js b/commands/random/today.js
deleted file mode 100644
index 50430753..00000000
--- a/commands/random/today.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const commando = require('discord.js-commando');
-const Discord = require('discord.js');
-const request = require('superagent');
-
-module.exports = class TodayCommand extends commando.Command {
-    constructor(Client){
-        super(Client, {
-            name: 'today',
-            aliases: [
-                'history'
-            ],
-            group: 'random',
-            memberName: 'today',
-            description: 'Tells you what happened today. (;today)',
-            examples: [';today']
-        });
-    }
-
-    async run(message) {
-        if(message.channel.type !== 'dm') {
-            if(!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return;
-        }
-        console.log("[Command] " + message.content);
-        request
-        .get('http://history.muffinlabs.com/date')
-        .then(function (response) {
-            let randomNumber = Math.floor(Math.random() * response.body.data.Events.length);
-            const embed = new Discord.RichEmbed()
-            .setColor(0x9797FF)
-            .setURL(response.body.url)
-            .setTitle('On this day (' + response.body.date + ')...')
-            .setTimestamp()
-            .setDescription(response.body.data.Events[randomNumber].text + ' (' + response.body.data.Events[randomNumber].year + ')');
-            message.channel.sendEmbed(embed).catch(console.error);
-        }).catch(function (err) {
-            message.channel.send(":x: Error! Something went wrong!");
-        });
-    }
-};
\ No newline at end of file
diff --git a/html/carbondesc.html b/html/carbondesc.html
index 6318a8e9..a9ec9116 100644
--- a/html/carbondesc.html
+++ b/html/carbondesc.html
@@ -45,12 +45,11 @@
       <li><a href="https://developers.google.com/youtube/v3/">YouTube Data API</a></li>
       <li><a href="https://market.mashape.com/ismaelc/yoda-speak">Yoda Speak API</a></li>
       <li><a href="https://bots.discord.pw/api">Discord Bots API</a></li>
-      <li><a href="http://history.muffinlabs.com/">Today in History API</a></li>
     </ul>
     <h2>Information</h2>
     <ul>
       <li><a href="https://discord.gg/fqQF8mc">Home Server</a></li>
-      <li>Command Count: 107</li>
+      <li>Command Count: 106</li>
       <li>Server Host: <a href="https://www.heroku.com/">Heroku</a></li>
     </ul>
   </div>
diff --git a/html/discordbots.html b/html/discordbots.html
index ca7e3787..39817112 100644
--- a/html/discordbots.html
+++ b/html/discordbots.html
@@ -93,12 +93,11 @@
       <li><a href="https://developers.google.com/youtube/v3/">YouTube Data API</a></li>
       <li><a href="https://market.mashape.com/ismaelc/yoda-speak">Yoda Speak API</a></li>
       <li><a href="https://bots.discord.pw/api">Discord Bots API</a></li>
-      <li><a href="http://history.muffinlabs.com/">Today in History API</a></li>
     </ul>
     <h2>Information</h2>
     <ul>
       <li><a href="https://discord.gg/fqQF8mc">Home Server</a></li>
-      <li>Command Count: 107</li>
+      <li>Command Count: 106</li>
       <li>Server Host: <a href="https://www.heroku.com/">Heroku</a></li>
     </ul>
   </div>
diff --git a/index.js b/index.js
index 7065319d..ab0b54f0 100644
--- a/index.js
+++ b/index.js
@@ -61,14 +61,14 @@ client.on('message', (message) => {
 client.on('guildMemberAdd', member => {
     if(member.guild.id !== config.server) return;
     member.addRole(member.guild.roles.find('name', 'Members'));
-    let username = member.user.username;
-    member.guild.defaultChannel.send('Welcome ' + username + '!');
+    let addedMemberName = member.user.username;
+    member.guild.defaultChannel.send('Welcome ' + addedMemberName + '!');
 });
 
 client.on('guildMemberRemove', member => {
     if(member.guild.id !== config.server) return;
-    let username = member.user.username;
-    member.guild.defaultChannel.send('Bye ' + username + '...');
+    let removedMemberName = member.user.username;
+    member.guild.defaultChannel.send('Bye ' + removedMemberName + '...');
 });
 
 client.on('guildCreate', guild => {