diff --git a/src/dorkbox/util/TeeOutputStream.java b/src/dorkbox/util/TeeOutputStream.java
deleted file mode 100644
index 448dd18..0000000
--- a/src/dorkbox/util/TeeOutputStream.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2010 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public
-class TeeOutputStream extends OutputStream {
-    private final OutputStream out;
-    private final OutputStream tee;
-
-    public
-    TeeOutputStream(OutputStream out, OutputStream tee) {
-        if (out == null) {
-            throw new NullPointerException();
-        }
-        else if (tee == null) {
-            throw new NullPointerException();
-        }
-        else {
-            this.out = out;
-            this.tee = tee;
-        }
-    }
-
-    @Override
-    public
-    void write(int b) throws IOException {
-        this.out.write(b);
-        this.tee.write(b);
-    }
-
-    @Override
-    public
-    void write(byte[] b) throws IOException {
-        this.out.write(b);
-        this.tee.write(b);
-    }
-
-    @Override
-    public
-    void write(byte[] b, int off, int len) throws IOException {
-        this.out.write(b, off, len);
-        this.tee.write(b, off, len);
-    }
-
-    @Override
-    public
-    void flush() throws IOException {
-        this.out.flush();
-        this.tee.flush();
-    }
-
-    @Override
-    public
-    void close() throws IOException {
-        this.out.close();
-        this.tee.close();
-    }
-}
diff --git a/src/dorkbox/util/swing/DefaultMenuItemUI.java b/src/dorkbox/util/swing/DefaultMenuItemUI.java
deleted file mode 100644
index 4b1f476..0000000
--- a/src/dorkbox/util/swing/DefaultMenuItemUI.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2021 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.swing;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.accessibility.Accessible;
-import javax.swing.JComponent;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.MenuItemUI;
-
-public
-class DefaultMenuItemUI extends MenuItemUI {
-    private final ComponentUI ui;
-
-    public
-    DefaultMenuItemUI(final JComponent jComponent) {
-        this.ui = UIManager.getDefaults()
-                           .getUI(jComponent);
-    }
-
-    @Override
-    public
-    void installUI(final JComponent c) {
-        ui.installUI(c);
-    }
-
-    @Override
-    public
-    void uninstallUI(final JComponent c) {
-        ui.uninstallUI(c);
-    }
-
-    @Override
-    public
-    void paint(final Graphics g, final JComponent c) {
-        ui.paint(g, c);
-    }
-
-    @Override
-    public
-    void update(final Graphics g, final JComponent c) {
-        ui.update(g, c);
-    }
-
-    @Override
-    public
-    Dimension getPreferredSize(final JComponent c) {
-        return ui.getPreferredSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMinimumSize(final JComponent c) {
-        return ui.getMinimumSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMaximumSize(final JComponent c) {
-        return ui.getMaximumSize(c);
-    }
-
-    @Override
-    public
-    boolean contains(final JComponent c, final int x, final int y) {
-        return ui.contains(c, x, y);
-    }
-
-    @Override
-    public
-    int getBaseline(final JComponent c, final int width, final int height) {
-        return ui.getBaseline(c, width, height);
-    }
-
-    @Override
-    public
-    Component.BaselineResizeBehavior getBaselineResizeBehavior(final JComponent c) {
-        return ui.getBaselineResizeBehavior(c);
-    }
-
-    @Override
-    public
-    int getAccessibleChildrenCount(final JComponent c) {
-        return ui.getAccessibleChildrenCount(c);
-    }
-
-    @Override
-    public
-    Accessible getAccessibleChild(final JComponent c, final int i) {
-        return ui.getAccessibleChild(c, i);
-    }
-}
diff --git a/src/dorkbox/util/swing/DefaultPopupMenuUI.java b/src/dorkbox/util/swing/DefaultPopupMenuUI.java
deleted file mode 100644
index fe4acc5..0000000
--- a/src/dorkbox/util/swing/DefaultPopupMenuUI.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2021 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.swing;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.accessibility.Accessible;
-import javax.swing.JComponent;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.PopupMenuUI;
-
-public
-class DefaultPopupMenuUI extends PopupMenuUI {
-    private final ComponentUI ui;
-
-    public
-    DefaultPopupMenuUI(final JComponent jComponent) {
-        this.ui = UIManager.getDefaults()
-                           .getUI(jComponent);
-    }
-
-    @Override
-    public
-    void installUI(final JComponent c) {
-        ui.installUI(c);
-    }
-
-    @Override
-    public
-    void uninstallUI(final JComponent c) {
-        ui.uninstallUI(c);
-    }
-
-    @Override
-    public
-    void paint(final Graphics g, final JComponent c) {
-        ui.paint(g, c);
-    }
-
-    @Override
-    public
-    void update(final Graphics g, final JComponent c) {
-        ui.update(g, c);
-    }
-
-    @Override
-    public
-    Dimension getPreferredSize(final JComponent c) {
-        return ui.getPreferredSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMinimumSize(final JComponent c) {
-        return ui.getMinimumSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMaximumSize(final JComponent c) {
-        return ui.getMaximumSize(c);
-    }
-
-    @Override
-    public
-    boolean contains(final JComponent c, final int x, final int y) {
-        return ui.contains(c, x, y);
-    }
-
-    @Override
-    public
-    int getBaseline(final JComponent c, final int width, final int height) {
-        return ui.getBaseline(c, width, height);
-    }
-
-    @Override
-    public
-    Component.BaselineResizeBehavior getBaselineResizeBehavior(final JComponent c) {
-        return ui.getBaselineResizeBehavior(c);
-    }
-
-    @Override
-    public
-    int getAccessibleChildrenCount(final JComponent c) {
-        return ui.getAccessibleChildrenCount(c);
-    }
-
-    @Override
-    public
-    Accessible getAccessibleChild(final JComponent c, final int i) {
-        return ui.getAccessibleChild(c, i);
-    }
-}
diff --git a/src/dorkbox/util/swing/DefaultSeparatorUI.java b/src/dorkbox/util/swing/DefaultSeparatorUI.java
deleted file mode 100644
index e99b92d..0000000
--- a/src/dorkbox/util/swing/DefaultSeparatorUI.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2021 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.swing;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.accessibility.Accessible;
-import javax.swing.JComponent;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.SeparatorUI;
-
-public
-class DefaultSeparatorUI extends SeparatorUI {
-    private final ComponentUI ui;
-
-    public
-    DefaultSeparatorUI(final JComponent jComponent) {
-        this.ui = UIManager.getDefaults()
-                           .getUI(jComponent);
-    }
-
-    @Override
-    public
-    void installUI(final JComponent c) {
-        ui.installUI(c);
-    }
-
-    @Override
-    public
-    void uninstallUI(final JComponent c) {
-        ui.uninstallUI(c);
-    }
-
-    @Override
-    public
-    void paint(final Graphics g, final JComponent c) {
-        ui.paint(g, c);
-    }
-
-    @Override
-    public
-    void update(final Graphics g, final JComponent c) {
-        ui.update(g, c);
-    }
-
-    @Override
-    public
-    Dimension getPreferredSize(final JComponent c) {
-        return ui.getPreferredSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMinimumSize(final JComponent c) {
-        return ui.getMinimumSize(c);
-    }
-
-    @Override
-    public
-    Dimension getMaximumSize(final JComponent c) {
-        return ui.getMaximumSize(c);
-    }
-
-    @Override
-    public
-    boolean contains(final JComponent c, final int x, final int y) {
-        return ui.contains(c, x, y);
-    }
-
-    @Override
-    public
-    int getBaseline(final JComponent c, final int width, final int height) {
-        return ui.getBaseline(c, width, height);
-    }
-
-    @Override
-    public
-    Component.BaselineResizeBehavior getBaselineResizeBehavior(final JComponent c) {
-        return ui.getBaselineResizeBehavior(c);
-    }
-
-    @Override
-    public
-    int getAccessibleChildrenCount(final JComponent c) {
-        return ui.getAccessibleChildrenCount(c);
-    }
-
-    @Override
-    public
-    Accessible getAccessibleChild(final JComponent c, final int i) {
-        return ui.getAccessibleChild(c, i);
-    }
-}