diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/CraftChairsArrow.java
deleted file mode 100644
index 8842028..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/CraftChairsArrow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV16R3;
-
-import net.minecraft.server.v1_6_R3.EntityArrow;
-
-import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftArrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.cnaude.chairs.api.ChairsAPI;
-
-public class CraftChairsArrow extends CraftArrow implements Vehicle {
-
-	public CraftChairsArrow(CraftServer server, EntityArrow entity) {
-		super(server, entity);
-	}
-
-	@Override
-	public void remove() {
-		Entity passenger = getPassenger();
-		if (passenger != null && passenger instanceof Player) {
-			if (ChairsAPI.isSitting((Player) passenger)) {
-				return;
-			}
-		}
-		super.remove();
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/NMSChairsArrow.java
deleted file mode 100644
index af555d4..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV16R3/NMSChairsArrow.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV16R3;
-
-import net.minecraft.server.v1_6_R3.EntityArrow;
-
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
-import org.bukkit.entity.Arrow;
-
-import com.cnaude.chairs.vehiclearrow.NMSChairsArrowInterface;
-
-public class NMSChairsArrow extends EntityArrow implements NMSChairsArrowInterface {
-
-	public NMSChairsArrow(CraftWorld cworld) {
-		super(cworld.getHandle());
-	}
-
-	@Override
-	public void l_() {
-	}
-
-	@Override
-	public void setBukkitEntity(Server server) {
-		bukkitEntity = new CraftChairsArrow((CraftServer) server, this);
-	}
-
-	@Override
-	public Arrow getBukkitArrow() {
-		return (Arrow) bukkitEntity;
-	}
-
-	@Override
-	public void setArrowLocation(Location location) {
-		setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public void addToWorld() {
-		world.addEntity(this);
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/CraftChairsArrow.java
deleted file mode 100644
index 788070a..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/CraftChairsArrow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R1;
-
-import net.minecraft.server.v1_7_R1.EntityArrow;
-
-import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R1.entity.CraftArrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.cnaude.chairs.api.ChairsAPI;
-
-public class CraftChairsArrow extends CraftArrow implements Vehicle {
-
-	public CraftChairsArrow(CraftServer server, EntityArrow entity) {
-		super(server, entity);
-	}
-
-	@Override
-	public void remove() {
-		Entity passenger = getPassenger();
-		if (passenger != null && passenger instanceof Player) {
-			if (ChairsAPI.isSitting((Player) passenger)) {
-				return;
-			}
-		}
-		super.remove();
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/NMSChairsArrow.java
deleted file mode 100644
index 95afa12..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R1/NMSChairsArrow.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R1;
-
-import net.minecraft.server.v1_7_R1.EntityArrow;
-
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
-import org.bukkit.entity.Arrow;
-
-import com.cnaude.chairs.vehiclearrow.NMSChairsArrowInterface;
-
-public class NMSChairsArrow extends EntityArrow implements NMSChairsArrowInterface {
-
-	public NMSChairsArrow(CraftWorld cworld) {
-		super(cworld.getHandle());
-	}
-
-	@Override
-	public void h() {
-	}
-
-	@Override
-	public void setBukkitEntity(Server server) {
-		bukkitEntity = new CraftChairsArrow((CraftServer) server, this);
-	}
-
-	@Override
-	public Arrow getBukkitArrow() {
-		return (Arrow) bukkitEntity;
-	}
-
-	@Override
-	public void setArrowLocation(Location location) {
-		setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public void addToWorld() {
-		world.addEntity(this);
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/CraftChairsArrow.java
deleted file mode 100644
index af8b097..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/CraftChairsArrow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R2;
-
-import net.minecraft.server.v1_7_R2.EntityArrow;
-
-import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R2.entity.CraftArrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.cnaude.chairs.api.ChairsAPI;
-
-public class CraftChairsArrow extends CraftArrow implements Vehicle {
-
-	public CraftChairsArrow(CraftServer server, EntityArrow entity) {
-		super(server, entity);
-	}
-
-	@Override
-	public void remove() {
-		Entity passenger = getPassenger();
-		if (passenger != null && passenger instanceof Player) {
-			if (ChairsAPI.isSitting((Player) passenger)) {
-				return;
-			}
-		}
-		super.remove();
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/NMSChairsArrow.java
deleted file mode 100644
index bb1fb51..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R2/NMSChairsArrow.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R2;
-
-import net.minecraft.server.v1_7_R2.EntityArrow;
-
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R2.CraftWorld;
-import org.bukkit.entity.Arrow;
-
-import com.cnaude.chairs.vehiclearrow.NMSChairsArrowInterface;
-
-public class NMSChairsArrow extends EntityArrow implements NMSChairsArrowInterface {
-
-	public NMSChairsArrow(CraftWorld cworld) {
-		super(cworld.getHandle());
-	}
-
-	@Override
-	public void h() {
-	}
-
-	@Override
-	public void setBukkitEntity(Server server) {
-		bukkitEntity = new CraftChairsArrow((CraftServer) server, this);
-	}
-
-	@Override
-	public Arrow getBukkitArrow() {
-		return (Arrow) bukkitEntity;
-	}
-
-	@Override
-	public void setArrowLocation(Location location) {
-		setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public void addToWorld() {
-		world.addEntity(this);
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/CraftChairsArrow.java
deleted file mode 100644
index 15cc646..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/CraftChairsArrow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R3;
-
-import net.minecraft.server.v1_7_R3.EntityArrow;
-
-import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R3.entity.CraftArrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.cnaude.chairs.api.ChairsAPI;
-
-public class CraftChairsArrow extends CraftArrow implements Vehicle {
-
-	public CraftChairsArrow(CraftServer server, EntityArrow entity) {
-		super(server, entity);
-	}
-
-	@Override
-	public void remove() {
-		Entity passenger = getPassenger();
-		if (passenger != null && passenger instanceof Player) {
-			if (ChairsAPI.isSitting((Player) passenger)) {
-				return;
-			}
-		}
-		super.remove();
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/NMSChairsArrow.java
deleted file mode 100644
index 2466e1a..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R3/NMSChairsArrow.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R3;
-
-import net.minecraft.server.v1_7_R3.EntityArrow;
-
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
-import org.bukkit.entity.Arrow;
-
-import com.cnaude.chairs.vehiclearrow.NMSChairsArrowInterface;
-
-public class NMSChairsArrow extends EntityArrow implements NMSChairsArrowInterface {
-
-	public NMSChairsArrow(CraftWorld cworld) {
-		super(cworld.getHandle());
-	}
-
-	@Override
-	public void h() {
-	}
-
-	@Override
-	public void setBukkitEntity(Server server) {
-		bukkitEntity = new CraftChairsArrow((CraftServer) server, this);
-	}
-
-	@Override
-	public Arrow getBukkitArrow() {
-		return (Arrow) bukkitEntity;
-	}
-
-	@Override
-	public void setArrowLocation(Location location) {
-		setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public void addToWorld() {
-		world.addEntity(this);
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/CraftChairsArrow.java
deleted file mode 100644
index e5ed632..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/CraftChairsArrow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R4;
-
-import net.minecraft.server.v1_7_R4.EntityArrow;
-
-import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.cnaude.chairs.api.ChairsAPI;
-
-public class CraftChairsArrow extends CraftArrow implements Vehicle {
-
-	public CraftChairsArrow(CraftServer server, EntityArrow entity) {
-		super(server, entity);
-	}
-
-	@Override
-	public void remove() {
-		Entity passenger = getPassenger();
-		if (passenger != null && passenger instanceof Player) {
-			if (ChairsAPI.isSitting((Player) passenger)) {
-				return;
-			}
-		}
-		super.remove();
-	}
-
-}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/NMSChairsArrow.java
deleted file mode 100644
index 38a0193..0000000
--- a/src/com/cnaude/chairs/vehiclearrow/nmsV17R4/NMSChairsArrow.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.cnaude.chairs.vehiclearrow.nmsV17R4;
-
-import net.minecraft.server.v1_7_R4.EntityArrow;
-
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
-import org.bukkit.entity.Arrow;
-
-import com.cnaude.chairs.vehiclearrow.NMSChairsArrowInterface;
-
-public class NMSChairsArrow extends EntityArrow implements NMSChairsArrowInterface {
-
-	public NMSChairsArrow(CraftWorld cworld) {
-		super(cworld.getHandle());
-	}
-
-	@Override
-	public void h() {
-	}
-
-	@Override
-	public void setBukkitEntity(Server server) {
-		bukkitEntity = new CraftChairsArrow((CraftServer) server, this);
-	}
-
-	@Override
-	public Arrow getBukkitArrow() {
-		return (Arrow) bukkitEntity;
-	}
-
-	@Override
-	public void setArrowLocation(Location location) {
-		setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-	}
-
-	@Override
-	public void addToWorld() {
-		world.addEntity(this);
-	}
-
-}