diff --git a/jans-orm/core/src/main/java/io/jans/orm/operation/auth/BCrypt.java b/jans-orm/core/src/main/java/io/jans/orm/operation/auth/BCrypt.java
index c1d882c18e2..9082786c34a 100644
--- a/jans-orm/core/src/main/java/io/jans/orm/operation/auth/BCrypt.java
+++ b/jans-orm/core/src/main/java/io/jans/orm/operation/auth/BCrypt.java
@@ -51,25 +51,25 @@
  * hashpw method with a random salt, like this:
  * <p>
  * <code>
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br>
  * </code>
  * <p>
  * To check whether a plaintext password matches one that has been hashed
  * previously, use the checkpw method:
  * <p>
  * <code>
- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
- * else<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * if (BCrypt.checkpw(candidate_password, stored_hash))<br>
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br>
+ * else<br>
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br>
  * </code>
  * <p>
  * The gensalt() method takes an optional parameter (log_rounds) that determines
  * the computational complexity of the hashing:
  * <p>
  * <code>
- * String strong_salt = BCrypt.gensalt(10)<br />
- * String stronger_salt = BCrypt.gensalt(12)<br />
+ * String strong_salt = BCrypt.gensalt(10)<br>
+ * String stronger_salt = BCrypt.gensalt(12)<br>
  * </code>
  * <p>
  * The amount of work increases exponentially (2**log_rounds), so each increment
diff --git a/jans-orm/core/src/main/java/io/jans/orm/reflect/util/ReflectHelper.java b/jans-orm/core/src/main/java/io/jans/orm/reflect/util/ReflectHelper.java
index de86eef68fa..cc16910eeeb 100644
--- a/jans-orm/core/src/main/java/io/jans/orm/reflect/util/ReflectHelper.java
+++ b/jans-orm/core/src/main/java/io/jans/orm/reflect/util/ReflectHelper.java
@@ -149,7 +149,7 @@ public static boolean assignableFrom(Class<?> clazz, Class<?> intf) {
 
     /**
      * Perform resolution of a class name.
-     * <p/>
+     * <br>
      * Here we first check the context classloader, if one, before delegating to
      * {@link Class#forName(String, boolean, ClassLoader)} using the caller's
      * classloader
@@ -176,7 +176,7 @@ public static Class<?> classForName(String name, Class<?> caller) throws ClassNo
 
     /**
      * Perform resolution of a class name.
-     * <p/>
+     * <br>
      * Same as {@link #classForName(String, Class)} except that here we delegate
      * to {@link Class#forName(String)} if the context classloader lookup is
      * unsuccessful.
@@ -200,7 +200,7 @@ public static Class<?> classForName(String name) throws ClassNotFoundException {
 
     /**
      * Is this member publicly accessible.
-     * <p/>
+     * <br>
      * Short-hand for {@link #isPublic(Class, Member)} passing the member +
      * {@link Member#getDeclaringClass()}
      *
diff --git a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/LdapOperationService.java b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/LdapOperationService.java
index 7f19f920f0e..5d440fd5f21 100644
--- a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/LdapOperationService.java
+++ b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/LdapOperationService.java
@@ -80,9 +80,6 @@ <T> PagedResult<EntryData> searchPagedEntries(String dn, Filter filter, SearchSc
      * @return true if successfully added
      * @throws DuplicateEntryException
      * @throws ConnectionException
-     * @throws DuplicateEntryException
-     * @throws ConnectionException
-     * @throws LDAPException
      */
     boolean addEntry(String dn, Collection<Attribute> atts) throws DuplicateEntryException, ConnectionException;
 
diff --git a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapConnectionProvider.java b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapConnectionProvider.java
index b60f7a259f4..c64f2df33d8 100644
--- a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapConnectionProvider.java
+++ b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapConnectionProvider.java
@@ -103,8 +103,6 @@ public void create() {
      * @throws NumberFormatException
      * @throws LDAPException
      * @throws GeneralSecurityException
-     * @throws EncryptionException
-     * @throws EncryptionException
      */
     protected void init(Properties props) throws NumberFormatException, LDAPException, GeneralSecurityException {
         String serverProp = props.getProperty("servers");