diff --git a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
index e062c254..20ec1f26 100644
--- a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
+++ b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
@@ -36,8 +36,6 @@ public class GuiManager {
 	    JobsList.add(job);
 	}
 
-	JobsPlayer JPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
-
 	CMIGui gui = new CMIGui(player);
 	gui.setTitle(Jobs.getLanguage().getMessage("command.info.gui.pickjob"));
 	gui.setFiller(CMIMaterial.get(Jobs.getGCManager().guiFiller));
@@ -55,6 +53,8 @@ public class GuiManager {
 
 	gui.setInvSize(GuiSize);
 
+	JobsPlayer JPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
+
 	int i = 0;
 	int pos = Jobs.getGCManager().getJobsGUIStartPosition() - 1;
 
@@ -192,8 +192,11 @@ public class GuiManager {
 
 	int i = 0;
 	for (ActionType actionType : ActionType.values()) {
-	    List<JobInfo> info = job.getJobInfo(actionType);
+	    if (i > 54) {
+		break;
+	    }
 
+	    List<JobInfo> info = job.getJobInfo(actionType);
 	    if (info == null || info.isEmpty())
 		continue;
 
diff --git a/src/main/java/com/gamingmesh/jobs/NMS.java b/src/main/java/com/gamingmesh/jobs/NMS.java
index cd61825c..9bea577b 100644
--- a/src/main/java/com/gamingmesh/jobs/NMS.java
+++ b/src/main/java/com/gamingmesh/jobs/NMS.java
@@ -21,8 +21,4 @@ public interface NMS {
     public double getMaxHealth(LivingEntity entity);
 
     public short getDurability(ItemStack item);
-
-//    public Enchantment getEnchantment(String type);
-//
-//    public String getEnchantName(Enchantment type);
 }
diff --git a/src/main/java/com/gamingmesh/jobs/Placeholders/ChatFilterRule.java b/src/main/java/com/gamingmesh/jobs/Placeholders/ChatFilterRule.java
index d6a29106..e2040b7e 100644
--- a/src/main/java/com/gamingmesh/jobs/Placeholders/ChatFilterRule.java
+++ b/src/main/java/com/gamingmesh/jobs/Placeholders/ChatFilterRule.java
@@ -44,7 +44,7 @@ public class ChatFilterRule {
 	this.blockType = ChatFilterBlockType.None;
     }
 
-    public ChatFilterRule() { 
+    public ChatFilterRule() {
     }
 
     public List<Pattern> getPattern() {
diff --git a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java
index 36d72754..83215687 100644
--- a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java
+++ b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java
@@ -81,7 +81,6 @@ public class SignUtil {
 
     // Sign file
     public void LoadSigns() {
-	// Boolean false does not create a file
 	if (!Jobs.getGCManager().SignsEnabled)
 	    return;
 
@@ -141,7 +140,6 @@ public class SignUtil {
 	cancelSignTask();
     }
 
-    // Signs save file
     public void saveSigns() {
 	File f = new File(Jobs.getFolder(), "Signs.yml");
 	YamlConfiguration conf = YamlConfiguration.loadConfiguration(f);
diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
index cc28eb4c..990782fd 100644
--- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
@@ -185,25 +185,6 @@ public class GeneralConfigManager {
 	return currencyLimitUse.get(type);
     }
 
-    /**
-     * @deprecated Use {@link #useBreederFinder}
-     * Sets the breeder finder boolean
-     * @param state boolean
-     */
-    @Deprecated
-    public void setBreederFinder(boolean state) {
-	this.useBreederFinder = state;
-    }
-
-    /**
-     * @deprecated Use {@link #useBreederFinder}
-     * @return boolean
-     */
-    @Deprecated
-    public boolean isUseBreederFinder() {
-	return useBreederFinder;
-    }
-
     public void setTntFinder(boolean state) {
 	this.useTnTFinder = state;
     }
diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
index 2399b734..aeda506e 100644
--- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
+++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
@@ -1810,10 +1810,9 @@ public class JobsPaymentListener implements Listener {
 		    }
 		}
 
-		if (whiteList.contains("=") && whiteList.split("=").length == 2) {
-		    if (!hand.getEnchantments().containsKey(CMIEnchantment.getEnchantment(whiteList.split("=")[1]))) {
-			return false;
-		    }
+		if (whiteList.contains("=") && whiteList.split("=").length == 2 &&
+			    !hand.getEnchantments().containsKey(CMIEnchantment.getEnchantment(whiteList.split("=")[1]))) {
+		    return false;
 		}
 
 		if (mat != null && hand.getType().equals(mat.getMaterial())) {