diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache
index 228cd66e09a..27292e73521 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { {{configurationClassName}} } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: {{configurationClassName}};
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: {{configurationClassName}}) {
+    constructor(basePath?: string|string[], configuration?: {{configurationClassName}}) {
         this.configuration = configuration || new {{configurationClassName}}();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
index 93d39bb3699..66e8ee03758 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
@@ -63,7 +63,7 @@ export class {{classname}} extends BaseService {
 {{/withInterfaces}}
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: {{configurationClassName}}) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
 {{#operation}}
diff --git a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts
+++ b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api/pet.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api/pet.service.ts
index a7e2f0bd872..356cdf76d98 100644
--- a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api/pet.service.ts
+++ b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api/pet.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts
+++ b/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/others/typescript-angular/builds/composed-schemas/api/pet.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas/api/pet.service.ts
index a7e2f0bd872..356cdf76d98 100644
--- a/samples/client/others/typescript-angular/builds/composed-schemas/api/pet.service.ts
+++ b/samples/client/others/typescript-angular/builds/composed-schemas/api/pet.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api/default.service.ts b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api/default.service.ts
index c25f77b8cfc..8dd96805b82 100644
--- a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api/default.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api/default.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class DefaultService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts
index 72ee45636c8..d3c961709cf 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
index c5af33ebc1d..de5f063fed7 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/user.service.ts
index b38da71ea68..2017bb197dc 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts
index 49c2d0b14ae..bd521164ac1 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
index a0fb6372769..b16f3f92b60 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/user.service.ts
index dbc7cbfba6f..0ec7b789293 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts
index 49c2d0b14ae..bd521164ac1 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
index a0fb6372769..b16f3f92b60 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/user.service.ts
index dbc7cbfba6f..0ec7b789293 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api/default.service.ts b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api/default.service.ts
index c25f77b8cfc..8dd96805b82 100644
--- a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api/default.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api/default.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class DefaultService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts
index 72ee45636c8..d3c961709cf 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
index c5af33ebc1d..de5f063fed7 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/user.service.ts
index b38da71ea68..2017bb197dc 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts
index 71c29cd700c..0d8a3c94ba3 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts
index 71c29cd700c..0d8a3c94ba3 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts
index 71c29cd700c..0d8a3c94ba3 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/pet.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/pet.service.ts
index 09ff1c752e9..7c23109fcbd 100644
--- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/user.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/pet.service.ts
index 71c29cd700c..0d8a3c94ba3 100644
--- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/pet.service.ts
index 71c29cd700c..0d8a3c94ba3 100644
--- a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/store.service.ts
index 3640d2bbfd1..d7ef22bcbf3 100644
--- a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/user.service.ts
index 79188a67ed2..8ae881bfc48 100644
--- a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/pet.service.ts
index cacb957ff10..bcf947daeef 100644
--- a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/store.service.ts
index a00fa005329..bea75200beb 100644
--- a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/user.service.ts
index a30d7ff38b2..7f6bdae0ac2 100644
--- a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/pet.service.ts
index cacb957ff10..bcf947daeef 100644
--- a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/store.service.ts
index a00fa005329..bea75200beb 100644
--- a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/user.service.ts
index a30d7ff38b2..7f6bdae0ac2 100644
--- a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/pet.service.ts
index cacb957ff10..bcf947daeef 100644
--- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/store.service.ts
index a00fa005329..bea75200beb 100644
--- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/user.service.ts
index a30d7ff38b2..7f6bdae0ac2 100644
--- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts
index c0c316f1379..7f6c4293973 100644
--- a/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts
+++ b/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
 import { CustomHttpParameterCodec } from './encoder';
 import { Configuration } from './configuration';
 
@@ -8,7 +8,7 @@ export class BaseService {
     public configuration: Configuration;
     public encoder: HttpParameterCodec;
 
-    constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
+    constructor(basePath?: string|string[], configuration?: Configuration) {
         this.configuration = configuration || new Configuration();
         if (typeof this.configuration.basePath !== 'string') {
             const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v19/builds/default/api/pet.service.ts
index cacb957ff10..bcf947daeef 100644
--- a/samples/client/petstore/typescript-angular-v19/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v19/builds/default/api/pet.service.ts
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
 export class PetService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v19/builds/default/api/store.service.ts
index a00fa005329..bea75200beb 100644
--- a/samples/client/petstore/typescript-angular-v19/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v19/builds/default/api/store.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class StoreService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v19/builds/default/api/user.service.ts
index a30d7ff38b2..7f6bdae0ac2 100644
--- a/samples/client/petstore/typescript-angular-v19/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v19/builds/default/api/user.service.ts
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
 export class UserService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
-        super(httpClient, basePath, configuration);
+        super(basePath, configuration);
     }
 
     /**