diff --git a/src/main/java/core/packetproxy/ProxyFactory.java b/src/main/java/core/packetproxy/ProxyFactory.java
index b34a7f35..33cf32ba 100644
--- a/src/main/java/core/packetproxy/ProxyFactory.java
+++ b/src/main/java/core/packetproxy/ProxyFactory.java
@@ -67,7 +67,8 @@ public static Proxy create(ListenPort listen_info) throws Exception {
 			listen_socket.setReuseAddress(true);
 			proxy = new ProxyXmppSSLForward(listen_socket, listen_info);
 
-		} else { /* FORWARDER */
+		} else {
+			/* FORWARDER */
 
 			ServerSocket listen_socket = new ServerSocket(listen_info.getPort());
 			listen_socket.setReuseAddress(true);
diff --git a/src/main/java/core/packetproxy/util/Throwing.java b/src/main/java/core/packetproxy/util/Throwing.java
index b680f476..c452370c 100644
--- a/src/main/java/core/packetproxy/util/Throwing.java
+++ b/src/main/java/core/packetproxy/util/Throwing.java
@@ -1,7 +1,6 @@
 package packetproxy.util;
 
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
 
@@ -20,11 +19,6 @@ public static <T> Predicate<T> rethrowP(@Nonnull final ThrowingPredicate<T> pred
 		return predicate;
 	}
 
-	@Nonnull
-	public static <T, R> Function<T, R> rethrowF(@Nonnull final ThrowingFunction<T, R> function) {
-		return function;
-	}
-
 	@SuppressWarnings("unchecked")
 	@Nonnull
 	public static <E extends Throwable> void sneakyThrow(@Nonnull Throwable ex) throws E {
diff --git a/src/main/java/core/packetproxy/util/ThrowingBiConsumer.java b/src/main/java/core/packetproxy/util/ThrowingBiConsumer.java
deleted file mode 100644
index 6fabbf60..00000000
--- a/src/main/java/core/packetproxy/util/ThrowingBiConsumer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package packetproxy.util;
-
-import java.util.function.BiConsumer;
-
-@FunctionalInterface
-public interface ThrowingBiConsumer<T, R> extends BiConsumer<T, R> {
-
-	@Override
-	default void accept(final T t, final R r) {
-		try {
-
-			accept0(t, r);
-		} catch (Throwable ex) {
-
-			Throwing.sneakyThrow(ex);
-		}
-	}
-
-	void accept0(T t, R r) throws Throwable;
-}
diff --git a/src/main/java/core/packetproxy/util/ThrowingFunction.java b/src/main/java/core/packetproxy/util/ThrowingFunction.java
deleted file mode 100644
index 371ccca8..00000000
--- a/src/main/java/core/packetproxy/util/ThrowingFunction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package packetproxy.util;
-
-import java.util.function.Function;
-
-@FunctionalInterface
-public interface ThrowingFunction<T, R> extends Function<T, R> {
-
-	@Override
-	default R apply(T t) {
-		try {
-
-			return apply0(t);
-		} catch (Throwable ex) {
-
-			Throwing.sneakyThrow(ex);
-		}
-		return null;
-	}
-
-	R apply0(T t) throws Throwable;
-}
diff --git a/src/main/java/core/packetproxy/util/WithCounter.java b/src/main/java/core/packetproxy/util/WithCounter.java
deleted file mode 100644
index eb0801f1..00000000
--- a/src/main/java/core/packetproxy/util/WithCounter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package packetproxy.util;
-
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import javax.annotation.Nonnull;
-
-public class WithCounter {
-
-	private WithCounter() {
-	}
-
-	@Nonnull
-	public static <T> Consumer<T> withCounter(@Nonnull final ThrowingBiConsumer<Integer, T> consumer) {
-		AtomicInteger counter = new AtomicInteger(0);
-		return (T item) -> {
-			consumer.accept(counter.getAndIncrement(), item);
-		};
-	}
-}