diff --git a/resources/plugin.yml b/resources/plugin.yml
index 5d95601..6bd2a1c 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: MobArena
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.96.2.14
+version: 0.96.2.15
 softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:
diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java
index dbf2375..92f3fd6 100644
--- a/src/com/garbagemule/MobArena/ArenaImpl.java
+++ b/src/com/garbagemule/MobArena/ArenaImpl.java
@@ -1255,12 +1255,17 @@ public class ArenaImpl implements Arena
         
         for (Chunk c : chunks) {
             for (Entity e : c.getEntities()) {
-                if (!(e instanceof Item || e instanceof Vehicle || e instanceof Slime || e instanceof ExperienceOrb)) {
+                if (e == null) {
                     continue;
                 }
-                
-                if (e != null) {
-                    e.remove();
+
+                switch (e.getType()) {
+                    case DROPPED_ITEM:
+                    case EXPERIENCE_ORB:
+                    case ARROW:
+                    case MINECART:
+                    case BOAT:
+                        e.remove();
                 }
             }
         }