diff --git a/fineract-client/.openapi-generator-ignore b/fineract-client/.openapi-generator-ignore
index b650db45c..8a62e9a8f 100644
--- a/fineract-client/.openapi-generator-ignore
+++ b/fineract-client/.openapi-generator-ignore
@@ -9,3 +9,8 @@
 **/gradle*
 **/gradle
 **/src/main/AndroidManifest.xml
+
+# https://issues.apache.org/jira/browse/FINERACT-1231
+**/client/*.java
+!**/client/CollectionFormats.java
+!**/client/StringUtil.java
diff --git a/fineract-client/src/main/java/org/apache/fineract/client/util/FineractClient.java b/fineract-client/src/main/java/org/apache/fineract/client/util/FineractClient.java
index 41c77b959..9d4dba168 100644
--- a/fineract-client/src/main/java/org/apache/fineract/client/util/FineractClient.java
+++ b/fineract-client/src/main/java/org/apache/fineract/client/util/FineractClient.java
@@ -31,7 +31,6 @@ import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;
-import org.apache.fineract.client.ApiClient;
 import org.apache.fineract.client.auth.ApiKeyAuth;
 import org.apache.fineract.client.auth.HttpBasicAuth;
 import org.apache.fineract.client.services.AccountNumberFormatApi;