diff --git a/src/de/mas/wiiu/jnus/DecryptionService.java b/src/de/mas/wiiu/jnus/DecryptionService.java
index 1bf0bfc..9e0cad2 100644
--- a/src/de/mas/wiiu/jnus/DecryptionService.java
+++ b/src/de/mas/wiiu/jnus/DecryptionService.java
@@ -32,8 +32,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 
-import javax.management.RuntimeErrorException;
-
 import de.mas.wiiu.jnus.entities.TMD;
 import de.mas.wiiu.jnus.entities.Ticket;
 import de.mas.wiiu.jnus.entities.content.Content;
diff --git a/src/de/mas/wiiu/jnus/NUSTitleConfig.java b/src/de/mas/wiiu/jnus/NUSTitleConfig.java
index 9ae67b2..4f10af7 100644
--- a/src/de/mas/wiiu/jnus/NUSTitleConfig.java
+++ b/src/de/mas/wiiu/jnus/NUSTitleConfig.java
@@ -21,7 +21,6 @@ import de.mas.wiiu.jnus.implementations.woomy.WoomyInfo;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDGIPartitionTitle;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDGamePartition;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDInfo;
-import de.mas.wiiu.jnus.implementations.wud.reader.WUDDiscReader;
 import lombok.Data;
 
 @Data
diff --git a/src/de/mas/wiiu/jnus/entities/TMD.java b/src/de/mas/wiiu/jnus/entities/TMD.java
index 58018ae..0f9ad2f 100644
--- a/src/de/mas/wiiu/jnus/entities/TMD.java
+++ b/src/de/mas/wiiu/jnus/entities/TMD.java
@@ -30,7 +30,6 @@ import de.mas.wiiu.jnus.entities.content.Content;
 import de.mas.wiiu.jnus.entities.content.ContentInfo;
 import lombok.Data;
 import lombok.Getter;
-import lombok.ToString;
 import lombok.extern.java.Log;
 
 @Log
diff --git a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderLocal.java b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderLocal.java
index af6857f..97bb740 100644
--- a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderLocal.java
+++ b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderLocal.java
@@ -44,7 +44,6 @@ public final class NUSDataProviderLocal extends NUSDataProvider {
     public InputStream getInputStreamFromContent(Content content, long offset) throws IOException {
         File filepath = new File(getFilePathOnDisk(content));
         if (!filepath.exists()) {
-
             return null;
         }
         InputStream in = new FileInputStream(filepath);
diff --git a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUD.java b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUD.java
index eae19e7..126dfc3 100644
--- a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUD.java
+++ b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUD.java
@@ -24,7 +24,6 @@ import de.mas.wiiu.jnus.Settings;
 import de.mas.wiiu.jnus.entities.TMD;
 import de.mas.wiiu.jnus.entities.content.Content;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDGamePartition;
-import de.mas.wiiu.jnus.implementations.wud.parser.WUDInfo;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDPartitionHeader;
 import de.mas.wiiu.jnus.implementations.wud.reader.WUDDiscReader;
 import lombok.Getter;
diff --git a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUDGI.java b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUDGI.java
index d967014..66c8718 100644
--- a/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUDGI.java
+++ b/src/de/mas/wiiu/jnus/implementations/NUSDataProviderWUDGI.java
@@ -26,9 +26,7 @@ import de.mas.wiiu.jnus.entities.content.Content;
 import de.mas.wiiu.jnus.implementations.wud.parser.WUDGIPartitionTitle;
 import de.mas.wiiu.jnus.implementations.wud.reader.WUDDiscReader;
 import lombok.Getter;
-import lombok.extern.java.Log;
 
-@Log
 public class NUSDataProviderWUDGI extends NUSDataProvider {
     @Getter private final WUDGIPartitionTitle giPartitionTitle;
     @Getter private final WUDDiscReader discReader;
diff --git a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDGIPartitionTitle.java b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDGIPartitionTitle.java
index a11c652..f7c3bb7 100644
--- a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDGIPartitionTitle.java
+++ b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDGIPartitionTitle.java
@@ -2,7 +2,6 @@ package de.mas.wiiu.jnus.implementations.wud.parser;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
 
 import de.mas.wiiu.jnus.Settings;
 import de.mas.wiiu.jnus.entities.content.ContentFSTInfo;
diff --git a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfo.java b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfo.java
index bb3617f..42f4fab 100644
--- a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfo.java
+++ b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfo.java
@@ -16,11 +16,9 @@
  ****************************************************************************/
 package de.mas.wiiu.jnus.implementations.wud.parser;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import de.mas.wiiu.jnus.implementations.wud.reader.WUDDiscReader;
diff --git a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfoParser.java b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfoParser.java
index 6c0ab38..a8103c4 100644
--- a/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfoParser.java
+++ b/src/de/mas/wiiu/jnus/implementations/wud/parser/WUDInfoParser.java
@@ -16,7 +16,6 @@
  ****************************************************************************/
 package de.mas.wiiu.jnus.implementations.wud.parser;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -26,8 +25,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import de.mas.wiiu.jnus.Settings;
-import de.mas.wiiu.jnus.entities.TMD;
-import de.mas.wiiu.jnus.entities.Ticket;
 import de.mas.wiiu.jnus.entities.content.ContentFSTInfo;
 import de.mas.wiiu.jnus.entities.fst.FST;
 import de.mas.wiiu.jnus.entities.fst.FSTEntry;
diff --git a/src/de/mas/wiiu/jnus/implementations/wud/reader/WUDDiscReader.java b/src/de/mas/wiiu/jnus/implementations/wud/reader/WUDDiscReader.java
index 77b0477..b4aa814 100644
--- a/src/de/mas/wiiu/jnus/implementations/wud/reader/WUDDiscReader.java
+++ b/src/de/mas/wiiu/jnus/implementations/wud/reader/WUDDiscReader.java
@@ -28,7 +28,6 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import de.mas.wiiu.jnus.implementations.wud.WUDImage;
-import de.mas.wiiu.jnus.utils.Utils;
 import de.mas.wiiu.jnus.utils.cryptography.AESDecryption;
 import lombok.Getter;
 import lombok.extern.java.Log;
diff --git a/src/de/mas/wiiu/jnus/utils/Utils.java b/src/de/mas/wiiu/jnus/utils/Utils.java
index b6c740d..f5b814a 100644
--- a/src/de/mas/wiiu/jnus/utils/Utils.java
+++ b/src/de/mas/wiiu/jnus/utils/Utils.java
@@ -17,17 +17,12 @@
 package de.mas.wiiu.jnus.utils;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;