diff --git a/.gitignore b/.gitignore
index a171023..1566d4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ config.properties
 /out
 /.idea
 /bin
+/src/javascript/bot/*.jar
diff --git a/.idea/dictionaries/AbbyTheRat.xml b/.idea/dictionaries/AbbyTheRat.xml
deleted file mode 100644
index c522388..0000000
--- a/.idea/dictionaries/AbbyTheRat.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="AbbyTheRat">
-    <words>
-      <w>cooldown</w>
-      <w>intial</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 5817f52..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="false" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/src/bot/CommandStructure/SetPrefixCS.java b/src/bot/CommandStructure/SetPrefixCS.java
index 1496fb8..ca8703d 100644
--- a/src/bot/CommandStructure/SetPrefixCS.java
+++ b/src/bot/CommandStructure/SetPrefixCS.java
@@ -29,11 +29,8 @@ public SetPrefixCS(SharedContainer container, String commandName, int commandID,
     @Override
     public void execute(Member author, User authorUser, MessageChannel channel, Message message, String parameters, Map<String, CommandStructure> commandList) {
         //Check to see if we're either botAdminOwner or guild Owner
-        String curGuildPrefix = "!";
         Long guildID = author.getGuild().getIdLong();
-        if (dbMan.getPrefix(guildID) != null) {
-            curGuildPrefix = dbMan.getPrefix(guildID);
-        }
+        String curGuildPrefix = dbMan.getPrefix(guildID);
 
         if (hasPermission(author)) {
             //if we don't have any parameters, we're resetting to default
diff --git a/src/javascript/bot/Ducky-Mc-Duckerson.jar b/src/javascript/bot/Ducky-Mc-Duckerson.jar
deleted file mode 100644
index d9d1bf0..0000000
Binary files a/src/javascript/bot/Ducky-Mc-Duckerson.jar and /dev/null differ