diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -1,15 +1,13 @@
 package com.gmail.nossr50;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.commands.skills.*;
 import com.gmail.nossr50.commands.spout.*;
 import com.gmail.nossr50.commands.mc.*;
 import com.gmail.nossr50.commands.party.*;
 import com.gmail.nossr50.commands.general.*;
 import com.gmail.nossr50.config.*;
 import com.gmail.nossr50.runnables.*;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.listeners.mcBlockListener;
 import com.gmail.nossr50.listeners.mcEntityListener;
@@ -187,23 +185,6 @@ public static PlayerProfile getPlayerProfile(Player player) {
         return Users.getProfile(player);
     }
 
-    /**
-     * Check the XP of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player
-     * @param skillType
-     */
-    public static void checkXp(Player player, SkillType skillType) {
-        if (skillType == SkillType.ALL) {
-            Skills.XpCheckAll(player);
-        }
-        else {
-            Skills.XpCheckSkill(skillType, player);
-        }
-    }
-
     /**
      * Things to be run when the plugin is disabled.
      */

diff --git a/src/main/java/com/gmail/nossr50/runnables/GainXp.java b/src/main/java/com/gmail/nossr50/runnables/GainXp.java
@@ -39,7 +39,7 @@ public void run() {
             damage += health;
         }
 
-        PP.addXP(skillType, (int) (damage * baseXp), player);
+        PP.addXP(skillType, (int) (damage * baseXp));
         Skills.XpCheckSkill(skillType, player);
     }
 }
diff --git a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java b/src/main/java/com/gmail/nossr50/skills/Acrobatics.java
@@ -58,7 +58,7 @@ public static void acrobaticsCheck(Player player, EntityDamageEvent event) {
 
             /* Check for death */
             if (health - damage >= 1) {
-                PP.addXP(SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER, player);
+                PP.addXP(SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
                 Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 
                 event.setDamage(newDamage);
@@ -76,7 +76,7 @@ public static void acrobaticsCheck(Player player, EntityDamageEvent event) {
             }
         }
         else if (health - damage >= 1) {
-            PP.addXP(SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER, player);
+            PP.addXP(SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
             Skills.XpCheckSkill(SkillType.ACROBATICS, player);
         }
     }
@@ -111,7 +111,7 @@ public static void dodgeChecks(EntityDamageByEntityEvent event) {
                 defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
 
                 if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
-                    PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER, defender);
+                    PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER);
                     Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
                 }
 

diff --git a/src/main/java/com/gmail/nossr50/skills/BlastMining.java b/src/main/java/com/gmail/nossr50/skills/BlastMining.java
@@ -257,7 +257,7 @@ public static void remoteDetonation(Player player, mcMMO plugin) {
         Block block = player.getTargetBlock(transparent, BLOCKS_AWAY);
 
         if (block.getType().equals(Material.TNT) && m.blockBreakSimulate(block, player, true) && PP.getSkillLevel(SkillType.MINING) >= 125) {
-            final int MAX_DISTANCE_AWAY = 10;
+            final double MAX_DISTANCE_AWAY = 10.0;
             AbilityType ability = AbilityType.BLAST_MINING;
 
             /* Check Cooldown */

diff --git a/src/main/java/com/gmail/nossr50/skills/Excavation.java b/src/main/java/com/gmail/nossr50/skills/Excavation.java
@@ -120,7 +120,7 @@ public static void excavationProcCheck(Block block, Player player) {
         }
 
         //Handle XP related tasks
-        PP.addXP(SkillType.EXCAVATION, xp, player);
+        PP.addXP(SkillType.EXCAVATION, xp);
         Skills.XpCheckSkill(SkillType.EXCAVATION, player);
     }
 

diff --git a/src/main/java/com/gmail/nossr50/skills/Fishing.java b/src/main/java/com/gmail/nossr50/skills/Fishing.java
@@ -101,7 +101,7 @@ private static void getFishingResults(Player player, PlayerFishEvent event) {
             FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
 
             if (random.nextInt(100) <= treasure.getDropChance()) {
-                Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp(), player);
+                Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
                 theCatch.setItemStack(treasure.getDrop());
             }
         }
@@ -116,7 +116,7 @@ private static void getFishingResults(Player player, PlayerFishEvent event) {
         }
 
         m.mcDropItem(player.getLocation(), new ItemStack(Material.RAW_FISH)); //Always drop a fish
-        PP.addXP(SkillType.FISHING, LoadProperties.mfishing, player);
+        PP.addXP(SkillType.FISHING, LoadProperties.mfishing);
         Skills.XpCheckSkill(SkillType.FISHING, player);
     }
 

diff --git a/src/main/java/com/gmail/nossr50/skills/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/Herbalism.java
@@ -251,7 +251,7 @@ else if (type.equals(Material.SUGAR_CANE_BLOCK)) {
                 }
             }
 
-            PP.addXP(SkillType.HERBALISM, xp, player);
+            PP.addXP(SkillType.HERBALISM, xp);
             Skills.XpCheckSkill(SkillType.HERBALISM, player);
         }
     }

diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java
@@ -145,7 +145,7 @@ public static void miningXP(Player player, Block block) {
             break;
         }
 
-        PP.addXP(SkillType.MINING, xp, player);
+        PP.addXP(SkillType.MINING, xp);
         Skills.XpCheckSkill(SkillType.MINING, player);
     }
 

diff --git a/src/main/java/com/gmail/nossr50/skills/Repair.java b/src/main/java/com/gmail/nossr50/skills/Repair.java
@@ -138,7 +138,7 @@ else if(ItemChecks.isHoe(is)) {
             dif = (short) (dif / 2);
         }
 
-        PP.addXP(SkillType.REPAIR, dif * 10, player);
+        PP.addXP(SkillType.REPAIR, dif * 10);
         Skills.XpCheckSkill(SkillType.REPAIR, player);
 
         //CLANG CLANG

diff --git a/src/main/java/com/gmail/nossr50/skills/Skills.java b/src/main/java/com/gmail/nossr50/skills/Skills.java
@@ -26,7 +26,7 @@
 public class Skills {
 
     private final static int TIME_CONVERSION_FACTOR = 1000;
-    private final static int MAX_DISTANCE_AWAY = 10;
+    private final static double MAX_DISTANCE_AWAY = 10.0;
 
     /**
      * Checks to see if the cooldown for an item or ability is expired.

diff --git a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
@@ -156,7 +156,7 @@ else if (x.getType() == Material.LEAVES) {
             }
         }
 
-        PP.addXP(SkillType.WOODCUTTING, xp, player); //Tree Feller gives nerf'd XP
+        PP.addXP(SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
         Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
     }
 
@@ -297,7 +297,7 @@ public static void woodcuttingBlockCheck(Player player, Block block) {
         }
 
         WoodCutting.woodCuttingProcCheck(player, block);
-        PP.addXP(SkillType.WOODCUTTING, xp, player);
+        PP.addXP(SkillType.WOODCUTTING, xp);
         Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
     }