diff --git a/src/main/java/org/dynmap/web/FileHandler.java b/src/main/java/org/dynmap/web/FileHandler.java
deleted file mode 100644
index 38223feb..00000000
--- a/src/main/java/org/dynmap/web/FileHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.dynmap.web;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class FileHandler implements HttpHandler {
-    private byte[] readBuffer = new byte[40960];
-
-    private static Map<String, String> mimes = new HashMap<String, String>();
-    static {
-        mimes.put(".html", "text/html");
-        mimes.put(".htm", "text/html");
-        mimes.put(".js", "text/javascript");
-        mimes.put(".png", "image/png");
-        mimes.put(".css", "text/css");
-        mimes.put(".txt", "text/plain");
-    }
-
-    public static final String getMimeTypeFromExtension(String extension) {
-        String m = mimes.get(extension);
-        if (m != null)
-            return m;
-        return "application/octet-steam";
-    }
-    
-    protected abstract InputStream getFileInput(String path);
-    
-    protected String getExtension(String path) {
-        int dotindex = path.lastIndexOf('.');
-        if (dotindex > 0)
-            return path.substring(dotindex);
-        return null;
-    }
-    
-    protected final String formatPath(String path) {
-        int qmark = path.indexOf('?');
-        if (qmark >= 0)
-            path = path.substring(0, qmark);
-
-        if (path.startsWith("/") || path.startsWith("."))
-            return null;
-        if (path.length() == 0)
-            path = getDefaultFilename(path);
-        return path;
-    }
-    
-    protected String getDefaultFilename(String path) {
-        return path + "index.html";
-    }
-    
-    @Override
-    public void handle(String path, HttpRequest request, HttpResponse response) throws IOException {
-        path = formatPath(path);
-        InputStream fileInput = getFileInput(path);
-        if (fileInput == null) {
-            response.statusCode = 404;
-            response.statusMessage = "Not found";
-            return;
-        }
-        
-        String extension = getExtension(path);
-
-        response.fields.put("Content-Type", getMimeTypeFromExtension(extension));
-        response.fields.put("Connection", "close");
-        OutputStream out = response.getBody();
-        try {
-            int readBytes;
-            while ((readBytes = fileInput.read(readBuffer)) > 0) {
-                out.write(readBuffer, 0, readBytes);
-            }
-        } catch (IOException e) {
-            fileInput.close();
-            throw e;
-        }
-        fileInput.close();
-    }
-}
diff --git a/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java b/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
index 9b5a0ae6..b6794098 100644
--- a/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
@@ -5,7 +5,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import org.dynmap.web.FileHandler;
 
 public class FilesystemHandler extends FileHandler {
     private File root;
diff --git a/src/main/java/org/dynmap/web/handlers/JarFileHandler.java b/src/main/java/org/dynmap/web/handlers/JarFileHandler.java
index aef3a7e7..3d1b21d9 100644
--- a/src/main/java/org/dynmap/web/handlers/JarFileHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/JarFileHandler.java
@@ -2,7 +2,6 @@ package org.dynmap.web.handlers;
 
 import java.io.InputStream;
 
-import org.dynmap.web.FileHandler;
 
 public class JarFileHandler extends FileHandler {
     private String root;