diff --git a/Core/src/main/java/com/plotsquared/core/location/Location.java b/Core/src/main/java/com/plotsquared/core/location/Location.java
index e0a3458ea..926909c3f 100644
--- a/Core/src/main/java/com/plotsquared/core/location/Location.java
+++ b/Core/src/main/java/com/plotsquared/core/location/Location.java
@@ -475,41 +475,6 @@ public final class Location extends BlockLoc implements Comparable<Location> {
             + this.world + "\"}";
     }
 
-    public boolean equals(final Object o) {
-        if (o == this)
-            return true;
-        if (!(o instanceof Location))
-            return false;
-        final Location other = (Location) o;
-        if (Float.compare(this.yaw, other.yaw) != 0)
-            return false;
-        if (Float.compare(this.pitch, other.pitch) != 0)
-            return false;
-        final Object this$blockVector3 = this.blockVector3;
-        final Object other$blockVector3 = other.blockVector3;
-        if (this$blockVector3 == null ?
-            other$blockVector3 != null :
-            !this$blockVector3.equals(other$blockVector3))
-            return false;
-        final Object this$world = this.getWorld();
-        final Object other$world = other.getWorld();
-        if (this$world == null ? other$world != null : !this$world.equals(other$world))
-            return false;
-        return true;
-    }
-
-    public int hashCode() {
-        final int PRIME = 59;
-        int result = 1;
-        result = result * PRIME + Float.floatToIntBits(this.yaw);
-        result = result * PRIME + Float.floatToIntBits(this.pitch);
-        final Object $blockVector3 = this.blockVector3;
-        result = result * PRIME + ($blockVector3 == null ? 43 : $blockVector3.hashCode());
-        final Object $world = this.getWorld();
-        result = result * PRIME + ($world == null ? 43 : $world.hashCode());
-        return result;
-    }
-
     public float getYaw() {
         return this.yaw;
     }
diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
index d2fb7b510..061a16578 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java
@@ -115,7 +115,7 @@ public class PlotId {
      *
      * @return Plot ID copy
      */
-    @NotNull public PlotId copy() {
+    @Nonnull public PlotId copy() {
         return of(this.getX(), this.getY());
     }
 
diff --git a/Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java b/Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
index 02b523787..fd9752aa3 100644
--- a/Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
+++ b/Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
@@ -419,7 +419,7 @@ public final class PlotQuery implements Iterable<Plot> {
         return this;
     }
 
-    @NotNull @Override public Iterator<Plot> iterator() {
+    @Nonnull @Override public Iterator<Plot> iterator() {
         return this.asCollection().iterator();
     }