diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index ef2c5da15..5ce3f356b 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -387,7 +387,6 @@ tasks.withType(JavaCompile) {
                 "UnusedMethod",
                 "ModifiedButNotUsed",
                 "TypeParameterUnusedInFormals",
-                "UnusedNestedClass",
                 "UndefinedEquals",
                 "JdkObsolete",
                 "EmptyBlockTag",
@@ -461,6 +460,7 @@ tasks.withType(JavaCompile) {
                 "EqualsUnsafeCast",
                 "DoubleBraceInitialization",
                 "UnnecessaryDefaultInEnumSwitch",
+                "UnusedNestedClass",
                 "InconsistentCapitalization",
                 "MissingOverride",
 //                "InvalidBlockTag",
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
index fdddb0406..15e62924c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
@@ -23,10 +23,8 @@ import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Date;
 import org.apache.fineract.infrastructure.core.service.RoutingDataSource;
-import org.apache.fineract.infrastructure.entityaccess.data.FineractEntityAccessData;
 import org.apache.fineract.infrastructure.entityaccess.data.FineractEntityRelationData;
 import org.apache.fineract.infrastructure.entityaccess.data.FineractEntityToEntityMappingData;
-import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntity;
 import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityAccessType;
 import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityRelation;
 import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityRelationRepositoryWrapper;
@@ -147,46 +145,6 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess
         return str.toString();
     }
 
-    private static final class FineractEntityAccessDataMapper implements RowMapper<FineractEntityAccessData> {
-
-        @Override
-        public FineractEntityAccessData mapRow(final ResultSet rs, @SuppressWarnings("unused") final int rowNum) throws SQLException {
-            final String entityType = rs.getString("entity_type");
-            final Long entityId = rs.getLong("entity_id");
-            // final String entityName = rs.getString("entity_name");
-            // final Long accessId = rs.getLong("access_id");
-            final String accessTypeDesc = rs.getString("access_type_desc");
-            // final String code = rs.getString("code");
-            final Long secondEntityId = rs.getLong("second_entity_id");
-            // final String secondEntityName =
-            // rs.getString("second_entity_name");
-            final String secondEntityType = rs.getString("second_entity_type");
-
-            FineractEntity firstEntity = null;
-            FineractEntityType etype = FineractEntityType.get(entityType);
-            if (etype != null) {
-                firstEntity = new FineractEntity(entityId, etype);
-            }
-
-            FineractEntity secondEntity = null;
-            FineractEntityType secondetype = FineractEntityType.get(secondEntityType);
-            if (etype != null) {
-                secondEntity = new FineractEntity(secondEntityId, secondetype);
-            }
-
-            FineractEntityAccessType accessType = null;
-            if (accessTypeDesc != null) {
-                accessType = FineractEntityAccessType.get(accessTypeDesc);
-            }
-
-            FineractEntityAccessData returnFineractEntityAccessData = null;
-            if (firstEntity != null && secondEntity != null && accessType != null) {
-                returnFineractEntityAccessData = new FineractEntityAccessData(firstEntity, accessType, secondEntity);
-            }
-            return returnFineractEntityAccessData;
-        }
-    }
-
     @Override
     public String getSQLQueryInClauseIDList_ForLoanProductsForOffice(Long officeId, boolean includeAllOffices) {