diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 77d23c43b..92bf39673 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -576,7 +576,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
 
     public BukkitPlayer getCachedPlayer(Player player) {
         List<MetadataValue> meta = player.getMetadata("WE");
-        if (meta == null || meta.isEmpty()) {
+        if (meta.isEmpty()) {
             return null;
         }
         return (BukkitPlayer) meta.get(0).value();
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java b/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java
index bf6e5c888..ade7c3887 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java
@@ -66,7 +66,6 @@ public enum FaweCache implements Trimable {
 
     public final char[] EMPTY_CHAR_4096 = new char[4096];
 
-    private final IdentityHashMap<Class<?>, CleanableThreadLocal> REGISTERED_SINGLETONS = new IdentityHashMap<>();
     private final IdentityHashMap<Class<?>, Pool> REGISTERED_POOLS = new IdentityHashMap<>();
 
     /*
@@ -91,9 +90,6 @@ public enum FaweCache implements Trimable {
             MUTABLE_VECTOR3.clean();
             MUTABLE_BLOCKVECTOR3.clean();
             SECTION_BITS_TO_CHAR.clean();
-            for (Map.Entry<Class<?>, CleanableThreadLocal> entry : REGISTERED_SINGLETONS.entrySet()) {
-                entry.getValue().clean();
-            }
         }
         for (Map.Entry<Class<?>, Pool> entry : REGISTERED_POOLS.entrySet()) {
             Pool pool = entry.getValue();
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java
index b175b62d3..79cfd9a51 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java
@@ -15,13 +15,14 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.IntStream;
+import org.jetbrains.annotations.Range;
 
 /**
  * Shared interface for IGetBlocks and ISetBlocks
  */
 public interface IBlocks extends Trimable {
 
-    boolean hasSection(int layer);
+    boolean hasSection(@Range(from = 0, to = 15) int layer);
 
     char[] load(int layer);