diff --git a/common/src/main/java/io/moquette/spi/impl/security/AES.java b/broker/src/main/java/io/moquette/spi/impl/security/AES.java
similarity index 96%
rename from common/src/main/java/io/moquette/spi/impl/security/AES.java
rename to broker/src/main/java/io/moquette/spi/impl/security/AES.java
index 285c2e9a..aac9f1cb 100755
--- a/common/src/main/java/io/moquette/spi/impl/security/AES.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/AES.java
@@ -3,18 +3,12 @@ package io.moquette.spi.impl.security;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
-import java.util.Base64;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;