diff --git a/Geekbot.net/Commands/Admin/Admin.cs b/Geekbot.net/Commands/Admin/Admin.cs
index 7d30689..7b5198d 100644
--- a/Geekbot.net/Commands/Admin/Admin.cs
+++ b/Geekbot.net/Commands/Admin/Admin.cs
@@ -30,7 +30,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("welcome", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Set a Welcome Message (use '$user' to mention the new joined user).")]
         public async Task SetWelcomeMessage([Remainder] [Summary("message")] string welcomeMessage)
         {
@@ -40,7 +39,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("modchannel", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Set a channel for moderation purposes")]
         public async Task SelectModChannel([Summary("#Channel")] ISocketMessageChannel channel)
         {
@@ -61,7 +59,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("showleave", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Notify modchannel when someone leaves")]
         public async Task ShowLeave([Summary("true/false")] bool enabled)
         {
@@ -88,7 +85,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("showdel", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Notify modchannel when someone deletes a message")]
         public async Task ShowDelete([Summary("true/false")] bool enabled)
         {
@@ -117,7 +113,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("setlang", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Change the bots language")]
         public async Task SetLanguage([Summary("language")] string languageRaw)
         {
@@ -142,7 +137,6 @@ namespace Geekbot.net.Commands.Admin
         }
         
         [Command("wiki", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Change the wikipedia instance (use lang code in xx.wikipedia.org)")]
         public async Task SetWikiLanguage([Summary("language")] string languageRaw)
         {
@@ -160,7 +154,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("lang", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Change the bots language")]
         public async Task GetLanguage()
         {
@@ -176,7 +169,6 @@ namespace Geekbot.net.Commands.Admin
         }
         
         [Command("ping", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Enable the ping reply.")]
         public async Task TogglePing()
         {
diff --git a/Geekbot.net/Commands/Admin/Mod.cs b/Geekbot.net/Commands/Admin/Mod.cs
index 6f79157..b34b328 100644
--- a/Geekbot.net/Commands/Admin/Mod.cs
+++ b/Geekbot.net/Commands/Admin/Mod.cs
@@ -32,7 +32,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("namehistory", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("See past usernames of an user")]
         public async Task UsernameHistory([Summary("@user")] IUser user)
         {
@@ -52,7 +51,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("kick", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Ban a user")]
         public async Task Kick([Summary("@user")] IUser userNormal,
             [Summary("reason")] [Remainder] string reason = "none")
diff --git a/Geekbot.net/Commands/Admin/Owner.cs b/Geekbot.net/Commands/Admin/Owner.cs
index a1a98d6..2f4e3ab 100644
--- a/Geekbot.net/Commands/Admin/Owner.cs
+++ b/Geekbot.net/Commands/Admin/Owner.cs
@@ -52,7 +52,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("youtubekey", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Set the youtube api key")]
         public async Task SetYoutubeKey([Summary("API Key")] string key)
         {
@@ -61,7 +60,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("game", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Set the game that the bot is playing")]
         public async Task SetGame([Remainder] [Summary("Game")] string key)
         {
@@ -72,7 +70,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("popuserrepo", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Populate user cache")]
         public async Task PopUserRepoCommand()
         {
@@ -104,7 +101,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command("error", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Throw an error un purpose")]
         public void PurposefulError()
         {
diff --git a/Geekbot.net/Commands/Admin/Role.cs b/Geekbot.net/Commands/Admin/Role.cs
index 24d19dd..8624e66 100644
--- a/Geekbot.net/Commands/Admin/Role.cs
+++ b/Geekbot.net/Commands/Admin/Role.cs
@@ -27,7 +27,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command(RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get a list of all available roles.")]
         public async Task GetAllRoles()
         {
@@ -53,7 +52,6 @@ namespace Geekbot.net.Commands.Admin
         }
 
         [Command(RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get a role by mentioning it.")]
         public async Task GiveRole([Summary("roleNickname")] string roleNameRaw)
         {
@@ -97,7 +95,6 @@ namespace Geekbot.net.Commands.Admin
 
         [RequireUserPermission(GuildPermission.ManageRoles)]
         [Command("add", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Add a role to the whitelist.")]
         public async Task AddRole([Summary("@role")] IRole role, [Summary("alias")] string roleName)
         {
@@ -132,7 +129,6 @@ namespace Geekbot.net.Commands.Admin
 
         [RequireUserPermission(GuildPermission.ManageRoles)]
         [Command("remove", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Remove a role from the whitelist.")]
         public async Task RemoveRole([Summary("roleNickname")] string roleName)
         {
@@ -156,7 +152,6 @@ namespace Geekbot.net.Commands.Admin
         }
         
         [RequireUserPermission(GuildPermission.ManageRoles)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Give a role by clicking on an emoji")]
         [Command("listen", RunMode = RunMode.Async)]
         public async Task AddListener([Summary("messageID")] string messageId, [Summary("Emoji")] string emoji, [Summary("@role")] IRole role)
diff --git a/Geekbot.net/Commands/Admin/Say.cs b/Geekbot.net/Commands/Admin/Say.cs
index 97c7a0f..f8708cd 100644
--- a/Geekbot.net/Commands/Admin/Say.cs
+++ b/Geekbot.net/Commands/Admin/Say.cs
@@ -18,7 +18,6 @@ namespace Geekbot.net.Commands.Admin
 
         [RequireUserPermission(GuildPermission.Administrator)]
         [Command("say", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Admin)]
         [Summary("Say Something.")]
         public async Task Echo([Remainder] [Summary("What?")] string echo)
         {
diff --git a/Geekbot.net/Commands/Games/Pokedex.cs b/Geekbot.net/Commands/Games/Pokedex.cs
index 57f842a..d4cbc0e 100644
--- a/Geekbot.net/Commands/Games/Pokedex.cs
+++ b/Geekbot.net/Commands/Games/Pokedex.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Games
         }
 
         [Command("pokedex", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("A Pokedex Tool")]
         public async Task GetPokemon([Summary("pokemonName")] string pokemonName)
         {
diff --git a/Geekbot.net/Commands/Games/Roll.cs b/Geekbot.net/Commands/Games/Roll.cs
index 30697df..59a3c27 100644
--- a/Geekbot.net/Commands/Games/Roll.cs
+++ b/Geekbot.net/Commands/Games/Roll.cs
@@ -22,7 +22,6 @@ namespace Geekbot.net.Commands.Games
         }
 
         [Command("roll", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Fun)]
         [Summary("Guess which number the bot will roll (1-100")]
         public async Task RollCommand([Remainder] [Summary("guess")] string stuff = "noGuess")
         {
diff --git a/Geekbot.net/Commands/Integrations/Google/Google.cs b/Geekbot.net/Commands/Integrations/Google/Google.cs
index 7bd3a56..4c86de3 100644
--- a/Geekbot.net/Commands/Integrations/Google/Google.cs
+++ b/Geekbot.net/Commands/Integrations/Google/Google.cs
@@ -23,7 +23,6 @@ namespace Geekbot.net.Commands.Integrations.Google
         }
         
         [Command("google", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Google Something.")]
         public async Task AskGoogle([Remainder, Summary("SearchText")] string searchText)
         {
diff --git a/Geekbot.net/Commands/Integrations/MagicTheGathering.cs b/Geekbot.net/Commands/Integrations/MagicTheGathering.cs
index 3074803..842c9de 100644
--- a/Geekbot.net/Commands/Integrations/MagicTheGathering.cs
+++ b/Geekbot.net/Commands/Integrations/MagicTheGathering.cs
@@ -23,7 +23,6 @@ namespace Geekbot.net.Commands.Integrations
         }
 
         [Command("mtg", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Games)]
         [Summary("Find a Magic The Gathering Card.")]
         public async Task GetCard([Remainder] [Summary("name")] string cardName)
         {
diff --git a/Geekbot.net/Commands/Integrations/Mal.cs b/Geekbot.net/Commands/Integrations/Mal.cs
index d70949a..36c6457 100644
--- a/Geekbot.net/Commands/Integrations/Mal.cs
+++ b/Geekbot.net/Commands/Integrations/Mal.cs
@@ -21,7 +21,6 @@ namespace Geekbot.net.Commands.Integrations
         }
 
         [Command("anime", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Show Info about an Anime.")]
         public async Task SearchAnime([Remainder] [Summary("AnimeName")] string animeName)
         {
@@ -70,7 +69,6 @@ namespace Geekbot.net.Commands.Integrations
         }
 
         [Command("manga", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Show Info about a Manga.")]
         public async Task SearchManga([Remainder] [Summary("MangaName")] string mangaName)
         {
diff --git a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs b/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
index 44402d0..3ad37f3 100644
--- a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
+++ b/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
@@ -20,7 +20,6 @@ namespace Geekbot.net.Commands.Integrations.UbranDictionary
         }
 
         [Command("urban", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Lookup something on urban dictionary")]
         public async Task UrbanDefine([Remainder] [Summary("word")] string word)
         {
diff --git a/Geekbot.net/Commands/Integrations/Wikipedia.cs b/Geekbot.net/Commands/Integrations/Wikipedia.cs
index 68589f6..e2e8928 100644
--- a/Geekbot.net/Commands/Integrations/Wikipedia.cs
+++ b/Geekbot.net/Commands/Integrations/Wikipedia.cs
@@ -28,7 +28,6 @@ namespace Geekbot.net.Commands.Integrations
         }
 
         [Command("wiki", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get an article from wikipedia.")]
         public async Task GetPreview([Remainder] [Summary("Article")] string articleName)
         {
diff --git a/Geekbot.net/Commands/Integrations/Youtube.cs b/Geekbot.net/Commands/Integrations/Youtube.cs
index f534bcd..a5d681e 100644
--- a/Geekbot.net/Commands/Integrations/Youtube.cs
+++ b/Geekbot.net/Commands/Integrations/Youtube.cs
@@ -21,7 +21,6 @@ namespace Geekbot.net.Commands.Integrations
         }
 
         [Command("yt", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Search for something on youtube.")]
         public async Task Yt([Remainder] [Summary("Title")] string searchQuery)
         {
diff --git a/Geekbot.net/Commands/Randomness/Cat/Cat.cs b/Geekbot.net/Commands/Randomness/Cat/Cat.cs
index 88a9ce5..a79eb37 100644
--- a/Geekbot.net/Commands/Randomness/Cat/Cat.cs
+++ b/Geekbot.net/Commands/Randomness/Cat/Cat.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Randomness.Cat
         }
 
         [Command("cat", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Return a random image of a cat.")]
         public async Task Say()
         {
diff --git a/Geekbot.net/Commands/Randomness/CheckEm.cs b/Geekbot.net/Commands/Randomness/CheckEm.cs
index fc962cc..325d7cc 100644
--- a/Geekbot.net/Commands/Randomness/CheckEm.cs
+++ b/Geekbot.net/Commands/Randomness/CheckEm.cs
@@ -21,7 +21,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("checkem", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Check for dubs")]
         public async Task MuhDubs()
         {
diff --git a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs b/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
index 6ff2255..8e8a369 100644
--- a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
+++ b/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Randomness.Chuck
         }
         
         [Command("chuck", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("A random chuck norris joke")]
         public async Task Say()
         {
diff --git a/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs b/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs
index e35798c..a14a098 100644
--- a/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs
+++ b/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Randomness.Dad
         }
         
         [Command("dad", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("A random dad joke")]
         public async Task Say()
         {
diff --git a/Geekbot.net/Commands/Randomness/Dog/Dog.cs b/Geekbot.net/Commands/Randomness/Dog/Dog.cs
index 08c1a9b..83d7a2e 100644
--- a/Geekbot.net/Commands/Randomness/Dog/Dog.cs
+++ b/Geekbot.net/Commands/Randomness/Dog/Dog.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Randomness.Dog
         }
 
         [Command("dog", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Return a random image of a dog.")]
         public async Task Say()
         {
diff --git a/Geekbot.net/Commands/Randomness/EightBall.cs b/Geekbot.net/Commands/Randomness/EightBall.cs
index 79ba6d1..cf59431 100644
--- a/Geekbot.net/Commands/Randomness/EightBall.cs
+++ b/Geekbot.net/Commands/Randomness/EightBall.cs
@@ -17,7 +17,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("8ball", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Ask 8Ball a Question.")]
         public async Task Ball([Remainder] [Summary("Question")] string echo)
         {
diff --git a/Geekbot.net/Commands/Randomness/Fortune.cs b/Geekbot.net/Commands/Randomness/Fortune.cs
index abc9ce5..498085a 100644
--- a/Geekbot.net/Commands/Randomness/Fortune.cs
+++ b/Geekbot.net/Commands/Randomness/Fortune.cs
@@ -15,7 +15,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("fortune", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random fortune")]
         public async Task GetAFortune()
         {
diff --git a/Geekbot.net/Commands/Randomness/Gdq.cs b/Geekbot.net/Commands/Randomness/Gdq.cs
index 3e17451..8d0472c 100644
--- a/Geekbot.net/Commands/Randomness/Gdq.cs
+++ b/Geekbot.net/Commands/Randomness/Gdq.cs
@@ -17,7 +17,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("gdq", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Games)]
         [Summary("Get a quote from the GDQ donation generator.")]
         public async Task GetQuote()
         {
diff --git a/Geekbot.net/Commands/Randomness/RandomAnimals.cs b/Geekbot.net/Commands/Randomness/RandomAnimals.cs
index a96aea8..608b52d 100644
--- a/Geekbot.net/Commands/Randomness/RandomAnimals.cs
+++ b/Geekbot.net/Commands/Randomness/RandomAnimals.cs
@@ -16,7 +16,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("panda", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random panda image")]
         public async Task Panda()
         {
@@ -25,7 +24,6 @@ namespace Geekbot.net.Commands.Randomness
 
         [Command("croissant", RunMode = RunMode.Async)]
         [Alias("gipfeli")]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random croissant image")]
         public async Task Croissant()
         {
@@ -33,7 +31,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("pumpkin", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random pumpkin image")]
         public async Task Pumpkin()
         {
@@ -41,7 +38,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("squirrel", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random squirrel image")]
         public async Task Squirrel()
         {
@@ -49,7 +45,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("turtle", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random turtle image")]
         public async Task Turtle()
         {
@@ -58,7 +53,6 @@ namespace Geekbot.net.Commands.Randomness
         
         [Command("pinguin", RunMode = RunMode.Async)]
         [Alias("pingu")]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random pinguin image")]
         public async Task Pinguin()
         {
@@ -66,7 +60,6 @@ namespace Geekbot.net.Commands.Randomness
         }
         
         [Command("fox", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Get a random fox image")]
         public async Task Fox()
         {
diff --git a/Geekbot.net/Commands/Randomness/Ship.cs b/Geekbot.net/Commands/Randomness/Ship.cs
index ffa18b4..735bd51 100644
--- a/Geekbot.net/Commands/Randomness/Ship.cs
+++ b/Geekbot.net/Commands/Randomness/Ship.cs
@@ -20,7 +20,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("Ship", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Fun)]
         [Summary("Ask the Shipping meter")]
         public async Task Command([Summary("@User1")] IUser user1, [Summary("@User2")] IUser user2)
         {
diff --git a/Geekbot.net/Commands/Randomness/Slap.cs b/Geekbot.net/Commands/Randomness/Slap.cs
index 129e89d..2cac9d2 100644
--- a/Geekbot.net/Commands/Randomness/Slap.cs
+++ b/Geekbot.net/Commands/Randomness/Slap.cs
@@ -21,7 +21,6 @@ namespace Geekbot.net.Commands.Randomness
         }
 
         [Command("slap", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Fun)]
         [Summary("slap someone")]
         public async Task Slapper([Summary("@user")] IUser user)
         {
diff --git a/Geekbot.net/Commands/User/GuildInfo.cs b/Geekbot.net/Commands/User/GuildInfo.cs
index dabe005..c475d99 100644
--- a/Geekbot.net/Commands/User/GuildInfo.cs
+++ b/Geekbot.net/Commands/User/GuildInfo.cs
@@ -25,7 +25,6 @@ namespace Geekbot.net.Commands.User
         }
 
         [Command("serverstats", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Statistics)]
         [Summary("Show some info about the bot.")]
         public async Task GetInfo()
         {
diff --git a/Geekbot.net/Commands/User/Karma.cs b/Geekbot.net/Commands/User/Karma.cs
index b63951e..2f427c8 100644
--- a/Geekbot.net/Commands/User/Karma.cs
+++ b/Geekbot.net/Commands/User/Karma.cs
@@ -26,7 +26,6 @@ namespace Geekbot.net.Commands.User
         }
 
         [Command("good", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Karma)]
         [Summary("Increase Someones Karma")]
         public async Task Good([Summary("@someone")] IUser user)
         {
@@ -74,7 +73,6 @@ namespace Geekbot.net.Commands.User
         }
 
         [Command("bad", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Karma)]
         [Summary("Decrease Someones Karma")]
         public async Task Bad([Summary("@someone")] IUser user)
         {
diff --git a/Geekbot.net/Commands/User/Ranking/Rank.cs b/Geekbot.net/Commands/User/Ranking/Rank.cs
index 9b1b32f..dd1d026 100644
--- a/Geekbot.net/Commands/User/Ranking/Rank.cs
+++ b/Geekbot.net/Commands/User/Ranking/Rank.cs
@@ -36,7 +36,6 @@ namespace Geekbot.net.Commands.User.Ranking
         }
 
         [Command("rank", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Statistics)]
         [Summary("get user top 10 in messages or karma")]
         public async Task RankCmd([Summary("type")] string typeUnformated = "messages", [Summary("amount")] int amount = 10)
         {
diff --git a/Geekbot.net/Commands/User/Stats.cs b/Geekbot.net/Commands/User/Stats.cs
index 19a6aa8..93bddef 100644
--- a/Geekbot.net/Commands/User/Stats.cs
+++ b/Geekbot.net/Commands/User/Stats.cs
@@ -23,7 +23,6 @@ namespace Geekbot.net.Commands.User
         }
 
         [Command("stats", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Statistics)]
         [Summary("Get information about this user")]
         public async Task User([Summary("@someone")] IUser user = null)
         {
diff --git a/Geekbot.net/Commands/Utils/AvatarGetter.cs b/Geekbot.net/Commands/Utils/AvatarGetter.cs
index d42c779..cf34ca3 100644
--- a/Geekbot.net/Commands/Utils/AvatarGetter.cs
+++ b/Geekbot.net/Commands/Utils/AvatarGetter.cs
@@ -17,7 +17,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("avatar", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get someones avatar")]
         public async Task GetAvatar([Remainder] [Summary("user")] IUser user = null)
         {
diff --git a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs b/Geekbot.net/Commands/Utils/Changelog/Changelog.cs
index f1752f7..c218c66 100644
--- a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs
+++ b/Geekbot.net/Commands/Utils/Changelog/Changelog.cs
@@ -25,9 +25,7 @@ namespace Geekbot.net.Commands.Utils.Changelog
         }
 
         [Command("changelog", RunMode = RunMode.Async)]
-        [Alias("updates")]
-        [Remarks(CommandCategories.Helpers)]
-        [Summary("Show the latest 5 updates")]
+        [Summary("Show the latest 10 updates")]
         public async Task GetChangelog()
         {
             try
diff --git a/Geekbot.net/Commands/Utils/Choose.cs b/Geekbot.net/Commands/Utils/Choose.cs
index 4d54654..2b9ff19 100644
--- a/Geekbot.net/Commands/Utils/Choose.cs
+++ b/Geekbot.net/Commands/Utils/Choose.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("choose", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Let the bot choose for you, seperate options with a semicolon.")]
         public async Task Command([Remainder] [Summary("option1;option2")]
             string choices)
diff --git a/Geekbot.net/Commands/Utils/Dice/Dice.cs b/Geekbot.net/Commands/Utils/Dice/Dice.cs
index 9c169c7..c8e31f5 100644
--- a/Geekbot.net/Commands/Utils/Dice/Dice.cs
+++ b/Geekbot.net/Commands/Utils/Dice/Dice.cs
@@ -11,7 +11,6 @@ namespace Geekbot.net.Commands.Utils.Dice
     public class Dice : ModuleBase
     {
         [Command("dice", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Randomness)]
         [Summary("Roll a dice.")]
         public async Task RollCommand([Remainder] [Summary("diceType")] string diceType = "1d20")
         {
diff --git a/Geekbot.net/Commands/Utils/Emojify.cs b/Geekbot.net/Commands/Utils/Emojify.cs
index 57363c2..07adadb 100644
--- a/Geekbot.net/Commands/Utils/Emojify.cs
+++ b/Geekbot.net/Commands/Utils/Emojify.cs
@@ -19,7 +19,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("emojify", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Emojify text")]
         public async Task Dflt([Remainder] [Summary("text")] string text)
         {
diff --git a/Geekbot.net/Commands/Utils/Help.cs b/Geekbot.net/Commands/Utils/Help.cs
index be9a747..4372692 100644
--- a/Geekbot.net/Commands/Utils/Help.cs
+++ b/Geekbot.net/Commands/Utils/Help.cs
@@ -18,7 +18,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("help", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("List all Commands")]
         public async Task GetHelp()
         {
diff --git a/Geekbot.net/Commands/Utils/Info.cs b/Geekbot.net/Commands/Utils/Info.cs
index de34e89..55615ea 100644
--- a/Geekbot.net/Commands/Utils/Info.cs
+++ b/Geekbot.net/Commands/Utils/Info.cs
@@ -27,7 +27,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("info", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get Information about the bot")]
         public async Task BotInfo()
         {
@@ -59,7 +58,6 @@ namespace Geekbot.net.Commands.Utils
         }
 
         [Command("uptime", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Get the Bot Uptime")]
         public async Task BotUptime()
         {
diff --git a/Geekbot.net/Commands/Utils/Ping.cs b/Geekbot.net/Commands/Utils/Ping.cs
index 226e9a3..653a46f 100644
--- a/Geekbot.net/Commands/Utils/Ping.cs
+++ b/Geekbot.net/Commands/Utils/Ping.cs
@@ -8,7 +8,6 @@ namespace Geekbot.net.Commands.Utils
     {
         [Command("👀", RunMode = RunMode.Async)]
         [Summary("Look at the bot.")]
-        [Remarks(CommandCategories.Fun)]
         public async Task Eyes()
         {
             await ReplyAsync("S... Stop looking at me... baka!");
diff --git a/Geekbot.net/Commands/Utils/Poll/Poll.cs b/Geekbot.net/Commands/Utils/Poll/Poll.cs
index 5d18a0f..e94e6d4 100644
--- a/Geekbot.net/Commands/Utils/Poll/Poll.cs
+++ b/Geekbot.net/Commands/Utils/Poll/Poll.cs
@@ -32,7 +32,6 @@ namespace Geekbot.net.Commands.Utils.Poll
         }
 
         [Command(RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Check status of the current poll")]
         public async Task Dflt()
         {
@@ -55,7 +54,6 @@ namespace Geekbot.net.Commands.Utils.Poll
         }
 
         [Command("create", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("Create a poll")]
         public async Task Create([Remainder] [Summary("question;option1;option2")]
             string rawPollString)
@@ -113,7 +111,6 @@ namespace Geekbot.net.Commands.Utils.Poll
         }
 
         [Command("end", RunMode = RunMode.Async)]
-        [Remarks(CommandCategories.Helpers)]
         [Summary("End the current poll")]
         public async Task End()
         {
diff --git a/Geekbot.net/Commands/Utils/Quote/Quote.cs b/Geekbot.net/Commands/Utils/Quote/Quote.cs
index 71c4089..ef0cbc8 100644
--- a/Geekbot.net/Commands/Utils/Quote/Quote.cs
+++ b/Geekbot.net/Commands/Utils/Quote/Quote.cs
@@ -26,7 +26,6 @@ namespace Geekbot.net.Commands.Utils.Quote
         }
 
         [Command]
-        [Remarks(CommandCategories.Quotes)]
         [Summary("Return a random quoute from the database")]
         public async Task GetRandomQuote()
         {
@@ -53,7 +52,6 @@ namespace Geekbot.net.Commands.Utils.Quote
         }
 
         [Command("save")]
-        [Remarks(CommandCategories.Quotes)]
         [Summary("Save a quote from the last sent message by @user")]
         public async Task SaveQuote([Summary("@user")] IUser user)
         {
@@ -89,7 +87,6 @@ namespace Geekbot.net.Commands.Utils.Quote
         }
 
         [Command("save")]
-        [Remarks(CommandCategories.Quotes)]
         [Summary("Save a quote from a message id")]
         public async Task SaveQuote([Summary("messageId")] ulong messageId)
         {
@@ -123,7 +120,6 @@ namespace Geekbot.net.Commands.Utils.Quote
         }
 
         [Command("make")]
-        [Remarks(CommandCategories.Quotes)]
         [Summary("Create a quote from the last sent message by @user")]
         public async Task ReturnSpecifiedQuote([Summary("@user")] IUser user)
         {
@@ -143,7 +139,6 @@ namespace Geekbot.net.Commands.Utils.Quote
         }
 
         [Command("make")]
-        [Remarks(CommandCategories.Quotes)]
         [Summary("Create a quote from a message id")]
         public async Task ReturnSpecifiedQuote([Summary("messageId")] ulong messageId)
         {
@@ -165,7 +160,6 @@ namespace Geekbot.net.Commands.Utils.Quote
        [RequireUserPermission(GuildPermission.KickMembers)]
        [RequireUserPermission(GuildPermission.ManageMessages)]
        [RequireUserPermission(GuildPermission.ManageRoles)]
-       [Remarks(CommandCategories.Quotes)]
        [Summary("Remove a quote (required mod permissions)")]
        public async Task RemoveQuote([Summary("quoteId")] int id)
        {
diff --git a/Geekbot.net/Lib/CommandCategories.cs b/Geekbot.net/Lib/CommandCategories.cs
deleted file mode 100644
index d67123b..0000000
--- a/Geekbot.net/Lib/CommandCategories.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Geekbot.net.Lib
-{
-    public static class CommandCategories
-    {
-        public const string Randomness = "Randomness";
-        public const string Karma = "Karma";
-        public const string Quotes = "Quotes";
-        public const string Fun = "Fun";
-        public const string Statistics = "Statistics";
-        public const string Helpers = "Helpers";
-        public const string Games = "Games";
-        public const string Admin = "Admin";
-        public const string Uncategorized = "Uncategorized";
-    }
-}
\ No newline at end of file
diff --git a/Geekbot.net/WebApi/Help/HelpController.cs b/Geekbot.net/WebApi/Help/HelpController.cs
index d71d26f..015c7d8 100644
--- a/Geekbot.net/WebApi/Help/HelpController.cs
+++ b/Geekbot.net/WebApi/Help/HelpController.cs
@@ -28,7 +28,6 @@ namespace Geekbot.net.WebApi.Help
                     {
                         Name = cmd.Name,
                         Summary = cmd.Summary,
-                        Category = cmd.Remarks ?? CommandCategories.Uncategorized,
                         IsAdminCommand = (param.Contains("admin")),
                         Aliases = cmd.Aliases.ToArray(),
                         Params = cmdParamsObj