diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index aa5f7aaaca60..411c776a37bf 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -40,7 +40,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src|
-|useES6|use JavaScript ES6 (ECMAScript 6). Default is ES6. (This option has been deprecated and will be removed in the 5.x release as ES5 is no longer supported)| |true|
 |useInheritance|use JavaScript prototype chains & delegation for inheritance| |true|
 |usePromises|use Promises as return values from the client API, instead of superagent callbacks| |false|
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index cd9e8094d5d9..5e8b04c7e550 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -202,9 +202,6 @@ public JavascriptClientCodegen() {
                 .defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)
                 .defaultValue(Boolean.TRUE.toString()));
-        cliOptions.add(new CliOption(USE_ES6,
-                "use JavaScript ES6 (ECMAScript 6). Default is ES6. (This option has been deprecated and will be removed in the 5.x release as ES5 is no longer supported)")
-                .defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
         cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
     }
@@ -226,11 +223,6 @@ public String getHelp() {
 
     @Override
     public void processOpts() {
-        if (additionalProperties.containsKey(USE_ES6)) {
-            setUseES6(convertPropertyToBooleanAndWriteBack(USE_ES6));
-        } else {
-            setUseES6(true); // default to ES6
-        }
         super.processOpts();
 
         if (StringUtils.isEmpty(System.getenv("JS_POST_PROCESS_FILE"))) {
@@ -455,17 +447,6 @@ public void setNpmRepository(String npmRepository) {
         this.npmRepository = npmRepository;
     }
 
-    public void setUseES6(boolean useES6) {
-        this.useES6 = useES6;
-        if (useES6) {
-            embeddedTemplateDir = templateDir = "Javascript/es6";
-            LOGGER.info("Using JS ES6 templates");
-        } else {
-            embeddedTemplateDir = templateDir = "Javascript";
-            LOGGER.info("Using JS ES5 templates");
-        }
-    }
-
     public void setUseInheritance(boolean useInheritance) {
         this.supportsInheritance = useInheritance;
         this.supportsMixins = useInheritance;
diff --git a/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
deleted file mode 100644
index 50906dbed6a6..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
+++ /dev/null
@@ -1,742 +0,0 @@
-{{>licenseInfo}}
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['superagent', 'querystring'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('superagent'), require('querystring'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.{{moduleName}}) {
-      root.{{moduleName}} = {};
-    }
-    root.{{moduleName}}.ApiClient = factory(root.superagent, root.querystring);
-  }
-}(this, function(superagent, querystring) {
-  'use strict';
-
-{{#emitJSDoc}}  /**
-   * @module {{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient
-   * @version {{projectVersion}}
-   */
-
-  /**
-   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
-   * application to use this class directly - the *Api and model classes provide the public API for the service. The
-   * contents of this file should be regarded as internal but are documented for completeness.
-   * @alias module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient
-   * @class
-   */
-{{/emitJSDoc}}  var exports = function() {
-{{#emitJSDoc}}    /**
-     * The base URL against which to resolve every API call's (relative) path.
-     * @type {String}
-     * @default {{{basePath}}}
-     */
-{{/emitJSDoc}}    this.basePath = '{{{basePath}}}'.replace(/\/+$/, '');
-
-{{#emitJSDoc}}    /**
-     * The authentication methods to be included for all API calls.
-     * @type {Array.<String>}
-     */
-{{/emitJSDoc}}{{=< >=}}    this.authentications = {
-<#authMethods>
-<#isBasic>
-<#isBasicBasic>
-      '<name>': {type: 'basic'}<^-last>,</-last>
-</isBasicBasic>
-<#isBasicBearer>
-      '<name>': {type: 'bearer'}<^-last>,</-last><#bearerFormat> // <&.></bearerFormat>
-</isBasicBearer>
-</isBasic>
-<#isApiKey>
-      '<name>': {type: 'apiKey', 'in': <#isKeyInHeader>'header'</isKeyInHeader><^isKeyInHeader>'query'</isKeyInHeader>, name: '<keyParamName>'}<^-last>,</-last>
-</isApiKey>
-<#isOAuth>
-      '<name>': {type: 'oauth2'}<^-last>,</-last>
-</isOAuth>
-</authMethods>
-    };
-<={{ }}=>
-{{#emitJSDoc}}    /**
-     * The default HTTP headers to be included for all API calls.
-     * @type {Array.<String>}
-     * @default {}
-     */
-{{/emitJSDoc}}    this.defaultHeaders = {};
-
-    /**
-     * The default HTTP timeout for all API calls.
-     * @type {Number}
-     * @default 60000
-     */
-    this.timeout = 60000;
-
-    /**
-     * If set to false an additional timestamp parameter is added to all API GET calls to
-     * prevent browser caching
-     * @type {Boolean}
-     * @default true
-     */
-    this.cache = true;
-
-{{#emitJSDoc}}    /**
-     * If set to true, the client will save the cookies from each server
-     * response, and return them in the next request.
-     * @default false
-     */
-{{/emitJSDoc}}    this.enableCookies = false;
-
-    /*
-     * Used to save and return cookies in a node.js (non-browser) setting,
-     * if this.enableCookies is set to true.
-     */
-    if (typeof window === 'undefined') {
-      this.agent = new superagent.agent();
-    }
-
-    /*
-     * Allow user to override superagent agent
-     */
-    this.requestAgent = null;
-
-    /*
-     * Allow user to add superagent plugins
-     */
-    this.plugins = null;
-  };
-
-{{#emitJSDoc}}  /**
-   * Returns a string representation for an actual parameter.
-   * @param param The actual parameter.
-   * @returns {String} The string representation of <code>param</code>.
-   */
-{{/emitJSDoc}}  exports.prototype.paramToString = function(param) {
-    if (param == undefined || param == null) {
-      return '';
-    }
-    if (param instanceof Date) {
-      return param.toJSON();
-    }
-    if (this.canBeJsonified(param)) {
-      return JSON.stringify(param);
-    }
-    return param.toString();
-  };
-
-{{#emitJSDoc}}  /**
-    * Returns a boolean indicating if the parameter could be JSON.stringified
-    * @param param The actual parameter
-    * @returns {Boolean} Flag indicating if <code>param</code> can be JSON.stringified
-    */
-{{/emitJSDoc}}  exports.prototype.canBeJsonified = function(str) {
-    if (typeof str !== 'string' && typeof str !== 'object') return false;
-    try {
-      const type = str.toString();
-      return type === '[object Object]'
-          || type === '[object Array]';
-    } catch (err) {
-      return false;
-    }
-  };
-
-{{#emitJSDoc}}
- /**
-   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
-   * NOTE: query parameters are not handled here.
-   * @param {String} path The path to append to the base URL.
-   * @param {Object} pathParams The parameter values to append.
-   * @returns {String} The encoded path with parameter values substituted.
-   */
-{{/emitJSDoc}}
-  exports.prototype.buildUrl = function(path, pathParams, apiBasePath) {
-    if (!path.match(/^\//)) {
-      path = '/' + path;
-    }
-    var url = this.basePath + path;
-
-
-    // use API (operation, path) base path if defined
-    if (apiBasePath !== null && apiBasePath !== undefined) {
-        url = apiBasePath + path;
-    }
-
-    var _this = this;
-    url = url.replace(/\{([\w-\.]+)\}/g, function(fullMatch, key) {
-      var value;
-      if (pathParams.hasOwnProperty(key)) {
-        value = _this.paramToString(pathParams[key]);
-      } else {
-        value = fullMatch;
-      }
-      return encodeURIComponent(value);
-    });
-    return url;
-  };
-
-{{#emitJSDoc}}  /**
-   * Checks whether the given content type represents JSON.<br>
-   * JSON content type examples:<br>
-   * <ul>
-   * <li>application/json</li>
-   * <li>application/json; charset=UTF8</li>
-   * <li>APPLICATION/JSON</li>
-   * </ul>
-   * @param {String} contentType The MIME content type to check.
-   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
-   */
-{{/emitJSDoc}}  exports.prototype.isJsonMime = function(contentType) {
-    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
-  };
-
-{{#emitJSDoc}}  /**
-   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
-   * @param {Array.<String>} contentTypes
-   * @returns {String} The chosen content type, preferring JSON.
-   */
-{{/emitJSDoc}}  exports.prototype.jsonPreferredMime = function(contentTypes) {
-    for (var i = 0; i < contentTypes.length; i++) {
-      if (this.isJsonMime(contentTypes[i])) {
-        return contentTypes[i];
-      }
-    }
-    return contentTypes[0];
-  };
-
-{{#emitJSDoc}}  /**
-   * Checks whether the given parameter value represents file-like content.
-   * @param param The parameter to check.
-   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
-   */
-{{/emitJSDoc}}  exports.prototype.isFileParam = function(param) {
-    // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
-    if (typeof require === 'function') {
-      var fs;
-      try {
-        fs = require('fs');
-      } catch (err) {}
-      if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
-        return true;
-      }
-    }
-    // Buffer in Node.js
-    if (typeof Buffer === 'function' && param instanceof Buffer) {
-      return true;
-    }
-    // Blob in browser
-    if (typeof Blob === 'function' && param instanceof Blob) {
-      return true;
-    }
-    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
-    if (typeof File === 'function' && param instanceof File) {
-      return true;
-    }
-    return false;
-  };
-
-{{#emitJSDoc}}  /**
-   * Normalizes parameter values:
-   * <ul>
-   * <li>remove nils</li>
-   * <li>keep files and arrays</li>
-   * <li>format to string with `paramToString` for other cases</li>
-   * </ul>
-   * @param {Object.<String, Object>} params The parameters as object properties.
-   * @returns {Object.<String, Object>} normalized parameters.
-   */
-{{/emitJSDoc}}  exports.prototype.normalizeParams = function(params) {
-    var newParams = {};
-    for (var key in params) {
-      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
-        var value = params[key];
-        if (this.isFileParam(value) || Array.isArray(value)) {
-          newParams[key] = value;
-        } else {
-          newParams[key] = this.paramToString(value);
-        }
-      }
-    }
-    return newParams;
-  };
-
-{{#emitJSDoc}}  /**
-   * Enumeration of collection format separator strategies.
-   * @enum {String}
-   * @readonly
-   */
-  exports.CollectionFormatEnum = {
-    /**
-     * Comma-separated values. Value: <code>csv</code>
-     * @const
-     */
-    CSV: ',',
-    /**
-     * Space-separated values. Value: <code>ssv</code>
-     * @const
-     */
-    SSV: ' ',
-    /**
-     * Tab-separated values. Value: <code>tsv</code>
-     * @const
-     */
-    TSV: '\t',
-    /**
-     * Pipe(|)-separated values. Value: <code>pipes</code>
-     * @const
-     */
-    PIPES: '|',
-    /**
-     * Native array. Value: <code>multi</code>
-     * @const
-     */
-    MULTI: 'multi'
-  };
-
-  /**
-   * Builds a string representation of an array-type actual parameter, according to the given collection format.
-   * @param {Array} param An array parameter.
-   * @param {module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
-   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
-   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
-   */
-{{/emitJSDoc}}  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
-    if (param == null) {
-      return null;
-    }
-    switch (collectionFormat) {
-      case 'csv':
-        return param.map(this.paramToString, this).join(',');
-      case 'ssv':
-        return param.map(this.paramToString, this).join(' ');
-      case 'tsv':
-        return param.map(this.paramToString, this).join('\t');
-      case 'pipes':
-        return param.map(this.paramToString, this).join('|');
-      case 'multi':
-        // return the array directly as SuperAgent will handle it as expected
-        return param.map(this.paramToString, this);
-      case 'passthrough':
-        return param;
-      default:
-        throw new Error('Unknown collection format: ' + collectionFormat);
-    }
-  };
-
-{{#emitJSDoc}}  /**
-   * Applies authentication headers to the request.
-   * @param {Object} request The request object created by a <code>superagent()</code> call.
-   * @param {Array.<String>} authNames An array of authentication method names.
-   */
-{{/emitJSDoc}}  exports.prototype.applyAuthToRequest = function(request, authNames) {
-    var _this = this;
-    authNames.forEach(function(authName) {
-      var auth = _this.authentications[authName];
-      switch (auth.type) {
-        case 'basic':
-          if (auth.username || auth.password) {
-            request.auth(auth.username || '', auth.password || '');
-          }
-          break;
-        case 'bearer':
-          if (auth.accessToken) {
-            var localVarBearerToken = typeof auth.accessToken === 'function'
-              ? auth.accessToken()
-              : auth.accessToken
-            request.set({'Authorization': 'Bearer ' + localVarBearerToken});
-          }
-          break;
-        case 'apiKey':
-          if (auth.apiKey) {
-            var data = {};
-            if (auth.apiKeyPrefix) {
-              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
-            } else {
-              data[auth.name] = auth.apiKey;
-            }
-            if (auth['in'] === 'header') {
-              request.set(data);
-            } else {
-              request.query(data);
-            }
-          }
-          break;
-        case 'oauth2':
-          if (auth.accessToken) {
-            request.set({'Authorization': 'Bearer ' + auth.accessToken});
-          }
-          break;
-        default:
-          throw new Error('Unknown authentication type: ' + auth.type);
-      }
-    });
-  };
-
-{{#emitJSDoc}}  /**
-   * Deserializes an HTTP response body into a value of the specified type.
-   * @param {Object} response A SuperAgent response object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns A value of the specified type.
-   */
-{{/emitJSDoc}}  exports.prototype.deserialize = function deserialize(response, returnType) {
-    if (response == null || returnType == null || response.status == 204) {
-      return null;
-    }
-    // Rely on SuperAgent for parsing response body.
-    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
-    var data = response.body;
-    if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
-      // SuperAgent does not always produce a body; use the unparsed response as a fallback
-      data = response.text;
-    }
-    return exports.convertToType(data, returnType);
-  };
-
-{{#emitJSDoc}}{{^usePromises}}  /**
-   * Callback function to receive the result of the operation.
-   * @callback module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient~callApiCallback
-   * @param {String} error Error message, if any.
-   * @param data The data returned by the service call.
-   * @param {String} response The complete HTTP response.
-   */
-
-{{/usePromises}}  /**
-   * Invokes the REST service using the supplied settings and parameters.
-   * @param {String} path The base URL to invoke.
-   * @param {String} httpMethod The HTTP method to use.
-   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
-   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
-   * @param {Object.<String, Object>} collectionQueryParams A map of collection query parameters and their values.
-   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
-   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
-   * @param {Object} bodyParam The value to pass as the request body.
-   * @param {Array.<String>} authNames An array of authentication type names.
-   * @param {Array.<String>} contentTypes An array of request MIME types.
-   * @param {Array.<String>} accepts An array of acceptable response MIME types.
-   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
-   * constructor for a complex type.{{^usePromises}}
-   * @param {module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient~callApiCallback} callback The callback function.{{/usePromises}}
-   * @returns {{#usePromises}}{Promise} A {@link https://www.promisejs.org/|Promise} object{{/usePromises}}{{^usePromises}}{Object} The SuperAgent request object{{/usePromises}}.
-   */
-{{/emitJSDoc}}  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
-      queryParams, collectionQueryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
-      returnType, apiBasePath{{^usePromises}}, callback{{/usePromises}}) {
-
-    var _this = this;
-    var url = this.buildUrl(path, pathParams, apiBasePath);
-    var request = superagent(httpMethod, url);
-
-    if (this.plugins !== null) {
-        for (var index in this.plugins) {
-            if (this.plugins.hasOwnProperty(index)) {
-                request.use(this.plugins[index])
-            }
-        }
-    }
-
-    // apply authentications
-    this.applyAuthToRequest(request, authNames);
-
-    // set collection query parameters
-    for (var key in collectionQueryParams) {
-      if (collectionQueryParams.hasOwnProperty(key)) {
-        var param = collectionQueryParams[key];
-        if (param.collectionFormat === 'csv') {
-          // SuperAgent normally percent-encodes all reserved characters in a query parameter. However,
-          // commas are used as delimiters for the 'csv' collectionFormat so they must not be encoded. We
-          // must therefore construct and encode 'csv' collection query parameters manually.
-          if (param.value != null) {
-            var value = param.value.map(this.paramToString).map(encodeURIComponent).join(',');
-            request.query(encodeURIComponent(key) + "=" + value);
-          }
-        } else {
-          // All other collection query parameters should be treated as ordinary query parameters.
-          queryParams[key] = this.buildCollectionParam(param.value, param.collectionFormat);
-        }
-      }
-    }
-
-    // set query parameters
-    if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {
-        queryParams['_'] = new Date().getTime();
-    }
-    request.query(this.normalizeParams(queryParams));
-
-    // set header parameters
-    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
-
-
-    // set requestAgent if it is set by user
-    if (this.requestAgent) {
-      request.agent(this.requestAgent);
-    }
-
-    // set request timeout
-    request.timeout(this.timeout);
-
-    var contentType = this.jsonPreferredMime(contentTypes);
-    if (contentType) {
-      // Issue with superagent and multipart/form-data (https://github.com/visionmedia/superagent/issues/746)
-      if(contentType != 'multipart/form-data') {
-        request.type(contentType);
-      }
-    }
-
-    if (contentType === 'application/x-www-form-urlencoded') {
-      request.send(querystring.stringify(this.normalizeParams(formParams)));
-    } else if (contentType == 'multipart/form-data') {
-      var _formParams = this.normalizeParams(formParams);
-      for (var key in _formParams) {
-        if (_formParams.hasOwnProperty(key)) {
-          let _formParamsValue = _formParams[key];
-          if (this.isFileParam(_formParamsValue)) {
-            // file field
-            request.attach(key, _formParamsValue);
-          } else if (Array.isArray(_formParamsValue) && _formParamsValue.length
-            && this.isFileParam(_formParamsValue[0])) {
-            // multiple files
-            _formParamsValue.forEach(file => request.attach(key, file));
-          } else {
-            request.field(key, _formParamsValue);
-          }
-        }
-      }
-    } else if (bodyParam !== null && bodyParam !== undefined) {
-      if (!request.header['Content-Type']) {
-          request.type('application/json');
-      }
-      request.send(bodyParam);
-    }
-
-    var accept = this.jsonPreferredMime(accepts);
-    if (accept) {
-      request.accept(accept);
-    }
-
-    if (returnType === 'Blob') {
-      request.responseType('blob');
-    } else if (returnType === 'String') {
-      request.responseType('string');
-    }
-
-    // Attach previously saved cookies, if enabled
-    if (this.enableCookies){
-      if (typeof window === 'undefined') {
-        this.agent._attachCookies(request);
-      }
-      else {
-        request.withCredentials();
-      }
-    }
-
-{{#usePromises}}    return new Promise(function(resolve, reject) {
-      request.end(function(error, response) {
-        if (error) {
-          reject(error);
-        } else {
-          try {
-            var data = _this.deserialize(response, returnType);
-            if (_this.enableCookies && typeof window === 'undefined'){
-              _this.agent._saveCookies(response);
-            }
-            resolve({data: data, response: response});
-          } catch (err) {
-            reject(err);
-          }
-        }
-      });
-    });{{/usePromises}}
-{{^usePromises}}    request.end(function(error, response) {
-      if (callback) {
-        var data = null;
-        if (!error) {
-          try {
-            data = _this.deserialize(response, returnType);
-            if (_this.enableCookies && typeof window === 'undefined'){
-              _this.agent._saveCookies(response);
-            }
-          } catch (err) {
-            error = err;
-          }
-        }
-        callback(error, data, response);
-      }
-    });
-
-    return request;
-{{/usePromises}}  };
-
-{{#emitJSDoc}}  /**
-   * Parses an ISO-8601 string representation or epoch representation of a date value.
-   * @param {String} str The date value as a string.
-   * @returns {Date} The parsed date object.
-   */
-{{/emitJSDoc}}  exports.parseDate = function(str) {
-    if (isNaN(str)) {
-      return new Date(str.replace(/(\d)(T)(\d)/i, '$1 $3'));
-    }
-    return new Date(+str);
-  };
-
-{{#emitJSDoc}}  /**
-   * Converts a value to the specified type.
-   * @param {(String|Object)} data The data to convert, as a string or object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns An instance of the specified type or null or undefined if data is null or undefined.
-   */
-{{/emitJSDoc}}  exports.convertToType = function(data, type) {
-    if (data === null || data === undefined)
-      return data
-
-    switch (type) {
-      case 'Boolean':
-        return Boolean(data);
-      case 'Integer':
-        return parseInt(data, 10);
-      case 'Number':
-        return parseFloat(data);
-      case 'String':
-        return String(data);
-      case 'Date':
-        return this.parseDate(String(data));
-      case 'Blob':
-        return data;
-      default:
-        if (type === Object) {
-          // generic object, return directly
-          return data;
-        } else if (typeof type.constructFromObject === 'function') {
-          // for model type like User or enum class
-          return type.constructFromObject(data);
-        } else if (Array.isArray(type)) {
-          // for array type like: ['String']
-          var itemType = type[0];
-          return data.map(function(item) {
-            return exports.convertToType(item, itemType);
-          });
-        } else if (typeof type === 'object') {
-          // for plain object type like: {'String': 'Integer'}
-          var keyType, valueType;
-          for (var k in type) {
-            if (type.hasOwnProperty(k)) {
-              keyType = k;
-              valueType = type[k];
-              break;
-            }
-          }
-          var result = {};
-          for (var k in data) {
-            if (data.hasOwnProperty(k)) {
-              var key = exports.convertToType(k, keyType);
-              var value = exports.convertToType(data[k], valueType);
-              result[key] = value;
-            }
-          }
-          return result;
-        } else {
-          // for unknown type, return the data directly
-          return data;
-        }
-    }
-  };
-
-    {{#emitJSDoc}}
-  /**
-    * Gets an array of host settings
-    * @returns An array of host settings
-    */
-    {{/emitJSDoc}}
-    exports.hostSettings = function() {
-        return [
-            {{#servers}}
-            {
-              'url': "{{{url}}}",
-              'description': "{{{description}}}{{^description}}No description provided{{/description}}",
-              {{#variables}}
-              {{#-first}}
-              'variables': {
-              {{/-first}}
-                {{{name}}}: {
-                    'description': "{{{description}}}{{^description}}No description provided{{/description}}",
-                    'default_value': "{{{defaultValue}}}",
-                    {{#enumValues}}
-                    {{#-first}}
-                    'enum_values': [
-                    {{/-first}}
-                      "{{{.}}}"{{^-last}},{{/-last}}
-                    {{#-last}}
-                    ]
-                    {{/-last}}
-                    {{/enumValues}}
-                  }{{^-last}},{{/-last}}
-                {{#-last}}
-                }
-                {{/-last}}
-              {{/variables}}
-            }{{^-last}},{{/-last}}
-            {{/servers}}
-      ];
-    };
-
-    exports.getBasePathFromSettings = function(index, variables) {
-        var variables = variables || {};
-        var servers = this.hostSettings();
-
-        // check array index out of bound
-        if (index < 0 || index >= servers.length) {
-            throw new Error("Invalid index " + index + " when selecting the host settings. Must be less than " + servers.length);
-        }
-
-        var server = servers[index];
-        var url = server['url'];
-
-        // go through variable and assign a value
-        for (var variable_name in server['variables']) {
-            if (variable_name in variables) {
-                let variable = server['variables'][variable_name];
-                if ( !('enum_values' in variable) || variable['enum_values'].includes(variables[variable_name]) ) {
-                    url = url.replace("{" + variable_name + "}", variables[variable_name]);
-                } else {
-                    throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");
-                }
-            } else {
-                // use default value
-                url = url.replace("{" + variable_name + "}", server['variables'][variable_name]['default_value'])
-            }
-        }
-        return url;
-    };
-
-{{#emitJSDoc}}  /**
-   * Constructs a new map or array model from REST data.
-   * @param data {Object|Array} The REST data.
-   * @param obj {Object|Array} The target object or array.
-   */
-{{/emitJSDoc}}  exports.constructFromObject = function(data, obj, itemType) {
-    if (Array.isArray(data)) {
-      for (var i = 0; i < data.length; i++) {
-        if (data.hasOwnProperty(i))
-          obj[i] = exports.convertToType(data[i], itemType);
-      }
-    } else {
-      for (var k in data) {
-        if (data.hasOwnProperty(k))
-          obj[k] = exports.convertToType(data[k], itemType);
-      }
-    }
-  };
-
-{{#emitJSDoc}}  /**
-   * The default API client implementation.
-   * @type {module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient}
-   */
-{{/emitJSDoc}}  exports.instance = new exports();
-
-  return exports;
-}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/README.mustache b/modules/openapi-generator/src/main/resources/Javascript/README.mustache
deleted file mode 100644
index fbf461bdde46..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/README.mustache
+++ /dev/null
@@ -1,214 +0,0 @@
-# {{projectName}}
-
-{{moduleName}} - JavaScript client for {{projectName}}
-{{#appDescriptionWithNewLines}}
-{{{.}}}
-{{/appDescriptionWithNewLines}}
-This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: {{appVersion}}
-- Package version: {{projectVersion}}
-{{^hideGenerationTimestamp}}
-- Build date: {{generatedDate}}
-{{/hideGenerationTimestamp}}
-- Build package: {{generatorClass}}
-{{#infoUrl}}
-For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
-{{/infoUrl}}
-
-## Installation
-
-### For [Node.js](https://nodejs.org/)
-
-#### npm
-
-To publish the library as a [npm](https://www.npmjs.com/), please follow the procedure in ["Publishing npm packages"](https://docs.npmjs.com/getting-started/publishing-npm-packages).
-
-Then install it via:
-
-```shell
-npm install {{{projectName}}} --save
-```
-
-##### Local development
-
-To use the library locally without publishing to a remote npm registry, first install the dependencies by changing into the directory containing `package.json` (and this README). Let's call this `JAVASCRIPT_CLIENT_DIR`. Then run:
-
-```shell
-npm install
-```
-
-Next, [link](https://docs.npmjs.com/cli/link) it globally in npm with the following, also from `JAVASCRIPT_CLIENT_DIR`:
-
-```shell
-npm link
-```
-
-Finally, switch to the directory you want to use your {{{projectName}}} from, and run:
-
-```shell
-npm link /path/to/<JAVASCRIPT_CLIENT_DIR>
-```
-
-You should now be able to `require('{{{projectName}}}')` in javascript files from the directory you ran the last command above from.
-
-### git
-
-If the library is hosted at a git repository, e.g. https://github.com/{{gitUserId}}{{^gitUserId}}YOUR_USERNAME{{/gitUserId}}/{{gitRepoId}}{{^gitRepoId}}{{projectName}}{{/gitRepoId}}
-then install it via:
-
-```shell
-    npm install {{gitUserId}}{{^gitUserId}}YOUR_USERNAME{{/gitUserId}}/{{gitRepoId}}{{^gitRepoId}}{{projectName}}{{/gitRepoId}} --save
-```
-
-### For browser
-
-The library also works in the browser environment via npm and [browserify](http://browserify.org/). After following the above steps with Node.js and installing browserify with `npm install -g browserify`, perform the following (assuming *main.js* is your entry file, that's to say your javascript file where you actually use this library):
-
-```shell
-browserify main.js > bundle.js
-```
-
-Then include *bundle.js* in the HTML pages.
-
-### Webpack Configuration
-
-Using Webpack you may encounter the following error: "Module not found: Error:
-Cannot resolve module", most certainly you should disable AMD loader. Add/merge
-the following section to your webpack config:
-
-```javascript
-module: {
-  rules: [
-    {
-      parser: {
-        amd: false
-      }
-    }
-  ]
-}
-```
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following JS code:
-
-```javascript
-var {{{moduleName}}} = require('{{{projectName}}}');
-{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
-{{#hasAuthMethods}}
-var defaultClient = {{{moduleName}}}.ApiClient.instance;
-{{#authMethods}}
-{{#isBasic}}
-{{#isBasicBasic}}
-// Configure HTTP basic authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.username = 'YOUR USERNAME'
-{{{name}}}.password = 'YOUR PASSWORD'
-{{/isBasicBasic}}
-{{#isBasicBearer}}
-// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.accessToken = "YOUR ACCESS TOKEN"
-{{/isBasicBearer}}
-{{/isBasic}}
-{{#isApiKey}}
-// Configure API key authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.apiKey = "YOUR API KEY"
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//{{{name}}}.apiKeyPrefix['{{{keyParamName}}}'] = "Token"
-{{/isApiKey}}
-{{#isOAuth}}
-// Configure OAuth2 access token for authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.accessToken = "YOUR ACCESS TOKEN"
-{{/isOAuth}}
-{{/authMethods}}
-{{/hasAuthMethods}}
-
-var api = new {{{moduleName}}}.{{{classname}}}()
-{{#hasParams}}
-{{#requiredParams}}
-var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}
-{{/requiredParams}}
-{{#optionalParams}}
-{{#-first}}
-var opts = {
-{{/-first}}
-  '{{{paramName}}}': {{{example}}}{{^-last}},{{/-last}} // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}
-{{#-last}}
-};
-{{/-last}}
-{{/optionalParams}}
-{{/hasParams}}
-{{#usePromises}}
-api.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}).then(function({{#returnType}}data{{/returnType}}) {
-  {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
-}, function(error) {
-  console.error(error);
-});
-
-{{/usePromises}}{{^usePromises}}
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
-  }
-};
-api.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}{{#hasParams}}, {{/hasParams}}callback);
-{{/usePromises}}{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to *{{basePath}}*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{moduleName}}.{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{summary}}
-{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
-
-## Documentation for Models
-
-{{#models}}{{#model}} - [{{moduleName}}.{{classname}}]({{modelDocPath}}{{classname}}.md)
-{{/model}}{{/models}}
-
-## Documentation for Authorization
-
-{{^authMethods}}
-All endpoints do not require authorization.
-{{/authMethods}}
-{{#authMethods}}
-{{#last}} Authentication schemes defined for the API:{{/last}}
-
-### {{name}}
-
-{{#isApiKey}}
-
-- **Type**: API key
-- **API key parameter name**: {{keyParamName}}
-- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
-{{/isApiKey}}
-{{#isBasic}}
-{{#isBasicBasic}}
-
-- **Type**: HTTP basic authentication
-{{/isBasicBasic}}
-{{#isBasicBearer}}
-
-- **Type**: Bearer authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}
-{{/isBasicBearer}}
-{{/isBasic}}
-{{#isOAuth}}
-
-- **Type**: OAuth
-- **Flow**: {{flow}}
-- **Authorization URL**: {{authorizationUrl}}
-- **Scopes**: {{^scopes}}N/A{{/scopes}}
-{{#scopes}}  - {{scope}}: {{description}}
-{{/scopes}}
-{{/isOAuth}}
-
-{{/authMethods}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/api.mustache b/modules/openapi-generator/src/main/resources/Javascript/api.mustache
deleted file mode 100644
index deb77ea00456..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/api.mustache
+++ /dev/null
@@ -1,130 +0,0 @@
-{{>licenseInfo}}
-{{=< >=}}(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['<#invokerPackage><&invokerPackage>/</invokerPackage>ApiClient'<#imports>, '<#invokerPackage><&invokerPackage>/</invokerPackage><#modelPackage><&modelPackage>/</modelPackage><&import>'</imports>], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient')<#imports>, require('../<#modelPackage><&modelPackage>/</modelPackage><import>')</imports>);
-  } else {
-    // Browser globals (root is window)
-    if (!root.<&moduleName>) {
-      root.<&moduleName> = {};
-    }
-    root.<&moduleName>.<&classname> = factory(root.<&moduleName>.ApiClient<#imports>, root.<&moduleName>.<import></imports>);
-  }
-}(this, function(ApiClient<#imports>, <&import></imports>) {
-  'use strict';
-
-<#emitJSDoc>  /**
-   * <baseName> service.
-   * @module <#invokerPackage><&invokerPackage>/</invokerPackage><#apiPackage><&apiPackage>/</apiPackage><&classname>
-   * @version <projectVersion>
-   */
-
-  /**
-   * Constructs a new <&classname>. <#description>
-   * <&description></description>
-   * @alias module:<#invokerPackage><&invokerPackage>/</invokerPackage><#apiPackage><&apiPackage>/</apiPackage><&classname>
-   * @class
-   * @param {module:<#invokerPackage><&invokerPackage>/</invokerPackage>ApiClient} [apiClient] Optional API client implementation to use,
-   * default to {@link module:<#invokerPackage><&invokerPackage>/</invokerPackage>ApiClient#instance} if unspecified.
-   */
-</emitJSDoc>  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
-
-<#operations><#operation><#emitJSDoc><^usePromises>
-    /**
-     * Callback function to receive the result of the <operationId> operation.
-     * @callback module:<#invokerPackage><invokerPackage>/</invokerPackage><#apiPackage><apiPackage>/</apiPackage><classname>~<operationId>Callback
-     * @param {String} error Error message, if any.
-     * @param <#vendorExtensions.x-jsdoc-type>{<&vendorExtensions.x-jsdoc-type>} data The data returned by the service call.</vendorExtensions.x-jsdoc-type><^vendorExtensions.x-jsdoc-type>data This operation does not return a value.</vendorExtensions.x-jsdoc-type>
-     * @param {String} response The complete HTTP response.
-     */</usePromises>
-
-    /**<#summary>
-     * <&summary></summary><#notes>
-     * <&notes></notes><#allParams><#required>
-     * @param {<&vendorExtensions.x-jsdoc-type>} <&paramName> <&description></required></allParams><#hasOptionalParams>
-     * @param {Object} opts Optional parameters<#allParams><^required>
-     * @param {<&vendorExtensions.x-jsdoc-type>} opts.<&paramName> <&description><#defaultValue> (default to <&.>)</defaultValue></required></allParams></hasOptionalParams><^usePromises>
-     * @param {module:<#invokerPackage><&invokerPackage>/</invokerPackage><#apiPackage><&apiPackage>/</apiPackage><&classname>~<&operationId>Callback} callback The callback function, accepting three arguments: error, data, response<#returnType>
-     * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises><#usePromises>
-     * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with an object containing data of type {@link <&vendorExtensions.x-jsdoc-type>} and HTTP response</returnType><^returnType>, with an object containing HTTP response</returnType></usePromises>
-     */
-</emitJSDoc>    this.<operationId><#usePromises>WithHttpInfo</usePromises> = function(<vendorExtensions.x-codegen-arg-list>) {<#hasOptionalParams>
-      opts = opts || {};</hasOptionalParams>
-      var postBody = <#bodyParam><#required><paramName></required><^required>opts['<paramName>']</required></bodyParam><^bodyParam>null</bodyParam>;
-<#allParams>
-<#required>
-      // verify the required parameter '<paramName>' is set
-      if (<paramName> === undefined || <paramName> === null) {
-        throw new Error("Missing the required parameter '<paramName>' when calling <operationId>");
-      }
-</required>
-</allParams>
-
-      var pathParams = {<#pathParams>
-        '<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><^-last>,</-last></pathParams>
-      };
-      var queryParams = {<#queryParams><^collectionFormat>
-        '<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required>,</collectionFormat></queryParams>
-      };
-      var collectionQueryParams = {<#queryParams><#collectionFormat>
-        '<baseName>': {
-          value: <#required><paramName></required><^required>opts['<paramName>']</required>,
-          collectionFormat: '<collectionFormat>'
-        },</collectionFormat></queryParams>
-      };
-      var headerParams = {<#headerParams>
-        '<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><^-last>,</-last></headerParams>
-      };
-      var formParams = {<#formParams>
-        '<baseName>': <#collectionFormat>this.apiClient.buildCollectionParam(<#required><paramName></required><^required>opts['<paramName>']</required>, '<collectionFormat>')</collectionFormat><^collectionFormat><#required><paramName></required><^required>opts['<paramName>']</required></collectionFormat><^-last>,</-last></formParams>
-      };
-
-      var authNames = [<#authMethods>'<name>'<^-last>, </-last></authMethods>];
-      var contentTypes = [<#consumes>'<& mediaType>'<^-last>, </-last></consumes>];
-      var accepts = [<#produces>'<& mediaType>'<^-last>, </-last></produces>];
-      var returnType = <#vendorExtensions.x-return-type><&vendorExtensions.x-return-type></vendorExtensions.x-return-type><^vendorExtensions.x-return-type>null</vendorExtensions.x-return-type>;
-      <#servers.0>
-      let basePaths = [<#servers>'<url>'<^-last>, </-last></servers>];
-      let basePath = basePaths[0]; // by default use the first one in "servers" defined in OpenAPI
-      if (typeof opts['_base_path_index'] !== 'undefined') {
-        if (opts['_base_path_index'] < 0 || opts['_base_path_index'] >= basePaths.length) {
-          throw new Error("Invalid index " + opts['_base_path_index'] + " when selecting the host settings. Must be less than " + basePaths.length);
-        }
-        basePath = basePaths[opts['_base_path_index']];
-      }
-
-      </servers.0>
-      return this.apiClient.callApi(
-        '<&path>', '<httpMethod>',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
-        authNames, contentTypes, accepts, returnType, <#servers.0>basePath</servers.0><^servers.0>null</servers.0><^usePromises>, callback</usePromises>
-      );
-    }
-<#usePromises>
-    <#emitJSDoc>
-
-    /**<#summary>
-     * <&summary></summary><#notes>
-     * <&notes></notes><#allParams><#required>
-     * @param {<&vendorExtensions.x-jsdoc-type>} <&paramName> <&description></required></allParams><#hasOptionalParams>
-     * @param {Object} opts Optional parameters<#allParams><^required>
-     * @param {<&vendorExtensions.x-jsdoc-type>} opts.<&paramName> <&description><#defaultValue> (default to <&.>)</defaultValue></required></allParams></hasOptionalParams><^usePromises>
-     * @param {module:<#invokerPackage><&invokerPackage>/</invokerPackage><#apiPackage><&apiPackage>/</apiPackage><&classname>~<&operationId>Callback} callback The callback function, accepting three arguments: error, data, response<#returnType>
-     * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises><#usePromises>
-     * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with data of type {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises>
-     */
-</emitJSDoc>    this.<operationId> = function(<vendorExtensions.x-codegen-arg-list>) {
-      return this.<operationId>WithHttpInfo(<vendorExtensions.x-codegen-arg-list>)
-        .then(function(response_and_data) {
-          return response_and_data.data;
-        });
-    }
-</usePromises>
-</operation></operations>  };
-
-  return exports;
-}));<={{ }}=>
diff --git a/modules/openapi-generator/src/main/resources/Javascript/api_doc.mustache b/modules/openapi-generator/src/main/resources/Javascript/api_doc.mustache
deleted file mode 100644
index 05a9d1e042c8..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/api_doc.mustache
+++ /dev/null
@@ -1,114 +0,0 @@
-# {{moduleName}}.{{classname}}{{#description}}
-
-{{.}}{{/description}}
-
-All URIs are relative to *{{basePath}}*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{summary}}
-{{/operation}}{{/operations}}
-
-{{#operations}}
-{{#operation}}
-
-## {{operationId}}
-
-> {{#returnType}}{{.}} {{/returnType}}{{operationId}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}})
-
-{{summary}}{{#notes}}
-
-{{.}}{{/notes}}
-
-### Example
-
-```javascript
-var {{{moduleName}}} = require('{{{projectName}}}');
-{{#hasAuthMethods}}
-var defaultClient = {{{moduleName}}}.ApiClient.instance;
-{{#authMethods}}
-{{#isBasic}}
-{{#isBasicBasic}}
-// Configure HTTP basic authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.username = 'YOUR USERNAME';
-{{{name}}}.password = 'YOUR PASSWORD';
-{{/isBasicBasic}}
-{{#isBasicBearer}}
-// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.accessToken = 'YOUR ACCESS TOKEN';
-{{/isBasicBearer}}
-{{/isBasic}}
-{{#isApiKey}}
-// Configure API key authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.apiKey = 'YOUR API KEY';
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//{{{name}}}.apiKeyPrefix = 'Token';
-{{/isApiKey}}
-{{#isOAuth}}
-// Configure OAuth2 access token for authorization: {{{name}}}
-var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.accessToken = 'YOUR ACCESS TOKEN';
-{{/isOAuth}}
-{{/authMethods}}
-{{/hasAuthMethods}}
-
-var apiInstance = new {{{moduleName}}}.{{{classname}}}();
-{{#requiredParams}}
-var {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
-{{/requiredParams}}
-{{#optionalParams}}
-{{#-first}}
-var opts = {
-{{/-first}}
-  '{{{paramName}}}': {{{example}}}{{^-last}},{{/-last}} // {{{dataType}}} | {{{description}}}
-{{#-last}}
-};
-{{/-last}}
-{{/optionalParams}}
-{{#usePromises}}
-apiInstance.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}).then(function({{#returnType}}data{{/returnType}}) {
-  {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
-}, function(error) {
-  console.error(error);
-});
-
-{{/usePromises}}
-{{^usePromises}}
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
-  }
-};
-apiInstance.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}{{#hasParams}}, {{/hasParams}}callback);
-{{/usePromises}}
-```
-
-### Parameters
-
-{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{.}}]{{/defaultValue}}
-{{/allParams}}
-
-### Return type
-
-{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}}
-
-### Authorization
-
-{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
-
-### HTTP request headers
-
-- **Content-Type**: {{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
-- **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
-
-{{/operation}}
-{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/api_test.mustache b/modules/openapi-generator/src/main/resources/Javascript/api_test.mustache
deleted file mode 100644
index 398e3041a718..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/api_test.mustache
+++ /dev/null
@@ -1,55 +0,0 @@
-{{>licenseInfo}}
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.{{moduleName}});
-  }
-}(this, function(expect, {{moduleName}}) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-    instance = new {{moduleName}}.{{classname}}();
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('{{classname}}', function() {
-{{#operations}}
-{{#operation}}
-    describe('{{operationId}}', function() {
-      it('should call {{operationId}} successfully', function(done) {
-        //uncomment below and update the code to test {{operationId}}
-        //instance.{{operationId}}(function(error) {
-        //  if (error) throw error;
-        //expect().to.be();
-        //});
-        done();
-      });
-    });
-{{/operation}}
-{{/operations}}
-  });
-
-}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/enumClass.mustache b/modules/openapi-generator/src/main/resources/Javascript/enumClass.mustache
deleted file mode 100644
index fb1e228577c9..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/enumClass.mustache
+++ /dev/null
@@ -1,19 +0,0 @@
-{{#emitJSDoc}}  /**
-   * Allowed values for the <code>{{baseName}}</code> property.
-   * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
-   * @readonly
-   */{{/emitJSDoc}}
-  exports.{{datatypeWithEnum}} = {
-  {{#allowableValues}}
-  {{#enumVars}}
-{{#emitJSDoc}}
-    /**
-     * value: {{{value}}}
-     * @const
-     */
-{{/emitJSDoc}}
-    "{{name}}": {{{value}}}{{^-last}},
-    {{/-last}}
-  {{/enumVars}}
-  {{/allowableValues}}
-  };
diff --git a/modules/openapi-generator/src/main/resources/Javascript/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/Javascript/git_push.sh.mustache
deleted file mode 100755
index 0e3776ae6dd4..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/git_push.sh.mustache
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
-#
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
-
-git_user_id=$1
-git_repo_id=$2
-release_note=$3
-git_host=$4
-
-if [ "$git_host" = "" ]; then
-    git_host="{{{gitHost}}}"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
-fi
-
-if [ "$git_user_id" = "" ]; then
-    git_user_id="{{{gitUserId}}}"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
-fi
-
-if [ "$git_repo_id" = "" ]; then
-    git_repo_id="{{{gitRepoId}}}"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
-fi
-
-if [ "$release_note" = "" ]; then
-    release_note="{{{releaseNote}}}"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
-fi
-
-# Initialize the local directory as a Git repository
-git init
-
-# Adds the files in the local repository and stages them for commit.
-git add .
-
-# Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
-
-# Sets the new remote
-git_remote=$(git remote)
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
-    else
-        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
-    fi
-
-fi
-
-git pull origin master
-
-# Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
diff --git a/modules/openapi-generator/src/main/resources/Javascript/gitignore.mustache b/modules/openapi-generator/src/main/resources/Javascript/gitignore.mustache
deleted file mode 100644
index e920c16718d1..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/gitignore.mustache
+++ /dev/null
@@ -1,33 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-node_modules
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
diff --git a/modules/openapi-generator/src/main/resources/Javascript/index.mustache b/modules/openapi-generator/src/main/resources/Javascript/index.mustache
deleted file mode 100644
index 1286f772bf94..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/index.mustache
+++ /dev/null
@@ -1,63 +0,0 @@
-{{>licenseInfo}}
-(function(factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient'{{#models}}, '{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{importPath}}'{{/models}}{{#apiInfo}}{{#apis}}, '{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#apiPackage}}{{.}}/{{/apiPackage}}{{importPath}}'{{/apis}}{{/apiInfo}}], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'){{#models}}, require('./{{#modelPackage}}{{.}}/{{/modelPackage}}{{importPath}}'){{/models}}{{#apiInfo}}{{#apis}}, require('./{{#apiPackage}}{{.}}/{{/apiPackage}}{{importPath}}'){{/apis}}{{/apiInfo}});
-  }
-}(function(ApiClient{{#models}}{{#model}}, {{classFilename}}{{/model}}{{/models}}{{#apiInfo}}{{#apis}}, {{importPath}}{{/apis}}{{/apiInfo}}) {
-  'use strict';
-
-{{#emitJSDoc}}  /**{{#projectDescription}}
-   * {{.}}.<br>{{/projectDescription}}
-   * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
-   * <p>
-   * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
-   * <pre>
-   * var {{moduleName}} = require('{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'); // See note below*.
-   * var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
-   * var yyyModel = new {{moduleName}}.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * <em>*NOTE: For a top-level AMD script, use require(['{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'], function(){...})
-   * and put the application logic within the callback function.</em>
-   * </p>
-   * <p>
-   * A non-AMD browser application (discouraged) might do something like this:
-   * <pre>
-   * var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
-   * var yyy = new {{moduleName}}.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * </p>
-   * @module {{#invokerPackage}}{{.}}/{{/invokerPackage}}index
-   * @version {{projectVersion}}
-   */{{/emitJSDoc}}
-{{=< >=}}  var exports = {<#emitJSDoc>
-    /**
-     * The ApiClient constructor.
-     * @property {module:<#invokerPackage><invokerPackage>/</invokerPackage>ApiClient}
-     */</emitJSDoc>
-    ApiClient: ApiClient<#models>,<#emitJSDoc>
-    /**
-     * The <importPath> model constructor.
-     * @property {module:<#invokerPackage><invokerPackage>/</invokerPackage><#modelPackage><modelPackage>/</modelPackage><importPath>}
-     */</emitJSDoc>
-    <importPath>: <importPath></models><#apiInfo><#apis>,<#emitJSDoc>
-    /**
-     * The <importPath> service constructor.
-     * @property {module:<#invokerPackage><invokerPackage>/</invokerPackage><#apiPackage><apiPackage>/</apiPackage><importPath>}
-     */</emitJSDoc>
-    <importPath>: <importPath></apis></apiInfo>
-  };
-
-  return exports;<={{ }}=>
-}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/Javascript/licenseInfo.mustache
deleted file mode 100644
index 571d22d4a65e..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/licenseInfo.mustache
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * {{{appName}}}
- * {{{appDescription}}}
- *
- {{#version}}
- * The version of the OpenAPI document: {{{.}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{.}}}
- {{/infoEmail}}
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- *
- * OpenAPI Generator version: {{{generatorVersion}}}
- *
- * Do not edit the class manually.
- *
- */
diff --git a/modules/openapi-generator/src/main/resources/Javascript/mocha.opts b/modules/openapi-generator/src/main/resources/Javascript/mocha.opts
deleted file mode 100644
index 907011807d68..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
---timeout 10000
diff --git a/modules/openapi-generator/src/main/resources/Javascript/model.mustache b/modules/openapi-generator/src/main/resources/Javascript/model.mustache
deleted file mode 100644
index 2621ddcba652..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/model.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-{{>licenseInfo}}
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['{{#invokerPackage}}{{.}}/{{/invokerPackage}}ApiClient'{{#imports}}, '{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{import}}'{{/imports}}], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'){{#imports}}, require('./{{import}}'){{/imports}});
-  } else {
-    // Browser globals (root is window)
-    if (!root.{{moduleName}}) {
-      root.{{moduleName}} = {};
-    }
-    root.{{moduleName}}.{{classname}} = factory(root.{{moduleName}}.ApiClient{{#imports}}, root.{{moduleName}}.{{import}}{{/imports}});
-  }
-}(this, function(ApiClient{{#imports}}, {{import}}{{/imports}}) {
-  'use strict';
-
-{{#models}}{{#model}}
-{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}
-{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/model_doc.mustache b/modules/openapi-generator/src/main/resources/Javascript/model_doc.mustache
deleted file mode 100644
index fc21ae6e9f1f..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/model_doc.mustache
+++ /dev/null
@@ -1,26 +0,0 @@
-{{#models}}{{#model}}{{#isEnum}}# {{moduleName}}.{{classname}}
-
-## Enum
-
-{{#allowableValues}}{{#enumVars}}
-* `{{name}}` (value: `{{{value}}}`)
-{{/enumVars}}{{/allowableValues}}
-{{/isEnum}}{{^isEnum}}# {{moduleName}}.{{classname}}
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{.}}]{{/defaultValue}}
-{{/vars}}
-{{#vars}}{{#isEnum}}
-
-
-## Enum: {{datatypeWithEnum}}
-
-{{#allowableValues}}{{#enumVars}}
-* `{{name}}` (value: `{{{value}}}`)
-{{/enumVars}}{{/allowableValues}}
-
-{{/isEnum}}{{/vars}}
-{{/isEnum}}{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/model_test.mustache b/modules/openapi-generator/src/main/resources/Javascript/model_test.mustache
deleted file mode 100644
index 53071a6ce09b..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/model_test.mustache
+++ /dev/null
@@ -1,66 +0,0 @@
-{{>licenseInfo}}
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD.
-    define(['expect.js', process.cwd()+'/src/{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require(process.cwd()+'/src/{{#invokerPackage}}{{.}}/{{/invokerPackage}}index'));
-  } else {
-    // Browser globals (root is window)
-    factory(root.expect, root.{{moduleName}});
-  }
-}(this, function(expect, {{moduleName}}) {
-  'use strict';
-
-  var instance;
-
-  beforeEach(function() {
-{{#models}}
-{{#model}}
-{{^isEnum}}
-    // create a new instance
-    //instance = new {{moduleName}}.{{classname}}();
-{{/isEnum}}
-{{/model}}
-{{/models}}
-  });
-
-  var getProperty = function(object, getter, property) {
-    // Use getter method if present; otherwise, get the property directly.
-    if (typeof object[getter] === 'function')
-      return object[getter]();
-    else
-      return object[property];
-  }
-
-  var setProperty = function(object, setter, property, value) {
-    // Use setter method if present; otherwise, set the property directly.
-    if (typeof object[setter] === 'function')
-      object[setter](value);
-    else
-      object[property] = value;
-  }
-
-  describe('{{classname}}', function() {
-    it('should create an instance of {{classname}}', function() {
-      // uncomment below and update the code to test {{classname}}
-      //var instance = new {{moduleName}}.{{classname}}();
-      //expect(instance).to.be.a({{moduleName}}.{{classname}});
-    });
-
-{{#models}}
-{{#model}}
-{{#vars}}
-    it('should have the property {{name}} (base name: "{{baseName}}")', function() {
-      // uncomment below and update the code to test the property {{name}}
-      //var instance = new {{moduleName}}.{{classname}}();
-      //expect(instance).to.be();
-    });
-
-{{/vars}}
-{{/model}}
-{{/models}}
-  });
-
-}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/package.mustache b/modules/openapi-generator/src/main/resources/Javascript/package.mustache
deleted file mode 100644
index 50f02589eff5..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/package.mustache
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "{{{projectName}}}",
-  "version": "{{{projectVersion}}}",
-  "description": "{{{projectDescription}}}",
-  "license": "{{licenseName}}",
-  "main": "{{sourceFolder}}{{#invokerPackage}}/{{.}}{{/invokerPackage}}/index.js",
-  "scripts": {
-    "test": "mocha --recursive"
-  },
-  "browser": {
-    "fs": false
-  },
-{{#npmRepository}}
-  "publishConfig":{
-    "registry":"{{npmRepository}}"
-  },
-{{/npmRepository}}
-  "dependencies": {
-    "superagent": "5.1.0"
-  },
-  "devDependencies": {
-    "expect.js": "^0.3.1",
-    "mocha": "^5.2.0",
-    "sinon": "^7.2.0"
-  }
-}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_enum_class.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_enum_class.mustache
deleted file mode 100644
index f72afdd14d77..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_enum_class.mustache
+++ /dev/null
@@ -1,33 +0,0 @@
-{{#emitJSDoc}}
-  /**
-   * Enum class {{classname}}.
-   * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
-   * @readonly
-   */
-{{/emitJSDoc}}
-  var exports = {
-  {{#allowableValues}}
-  {{#enumVars}}
-{{#emitJSDoc}}
-    /**
-     * value: {{{value}}}
-     * @const
-     */
-{{/emitJSDoc}}
-    "{{name}}": {{{value}}}{{^-last}},
-    {{/-last}}
-  {{/enumVars}}
-  {{/allowableValues}}
-  };
-
-  /**
-   * Returns a <code>{{classname}}</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {{=< >=}}{module:<#invokerPackage><invokerPackage>/</invokerPackage><#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> The enum <code>{{classname}}</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
deleted file mode 100644
index 6da2a98af9dc..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
+++ /dev/null
@@ -1,157 +0,0 @@
-{{#models}}{{#model}}
-{{#emitJSDoc}}
-  /**
-   * The {{classname}} model module.
-   * @module {{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{classname}}
-   * @version {{projectVersion}}
-   */
-
-  /**
-   * Constructs a new <code>{{classname}}</code>.{{#description}}
-   * {{.}}{{/description}}
-   * @alias module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{classname}}
-   * @class{{#useInheritance}}{{#parent}}
-   * @extends {{#parentModel}}module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-is-array}}Array{{/vendorExtensions.x-is-array}}{{#vendorExtensions.x-is-map}}Object{{/vendorExtensions.x-is-map}}{{/parentModel}}{{/parent}}{{#interfaces}}
-   * @implements module:{{#invokerPackage}}{{.}}/{{/invokerPackage}}{{#modelPackage}}{{.}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
-   * @param {{name}} {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{{description}}}{{/vendorExtensions.x-all-required}}
-   */
-{{/emitJSDoc}}
-  var exports = function({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
-    var _this = this;
-{{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}    _this = new Array();
-    Object.setPrototypeOf(_this, exports);
-{{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}
-    {{#useInheritance}}
-    {{#parentModel}}
-    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
-    {{/parentModel}}
-    {{^parentModel}}
-    {{#interfaceModels}}
-    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
-    {{/interfaceModels}}
-    {{/parentModel}}
-    {{/useInheritance}}
-    {{#vars}}
-    {{#required}}
-    {{#defaultValue}}
-    _this['{{baseName}}'] = {{name}} || {{{defaultValue}}};
-    {{/defaultValue}}
-    {{^defaultValue}}
-    _this['{{baseName}}'] = {{name}};
-    {{/defaultValue}}
-    {{/required}}
-    {{/vars}}
-    {{#parent}}
-    {{^parentModel}}
-    return _this;
-    {{/parentModel}}
-    {{/parent}}
-  };
-
-{{#emitJSDoc}}
-  /**
-   * Constructs a <code>{{classname}}</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {{=< >=}}{module:<#invokerPackage><invokerPackage>/</invokerPackage><#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> obj Optional instance to populate.
-   * @return {{=< >=}}{module:<#invokerPackage><invokerPackage>/</invokerPackage><#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> The populated <code>{{classname}}</code> instance.
-   */
-{{/emitJSDoc}}
-{{#vendorExtensions.x-is-primitive}}
-  exports.constructFromObject = function(data, obj) {
-    return data;
-  }
-{{/vendorExtensions.x-is-primitive}}
-{{^vendorExtensions.x-is-primitive}}
-  exports.constructFromObject = function(data, obj) {
-    if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
-      obj = obj || new exports();
-      {{#parent}}
-      {{^parentModel}}
-      ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-item-type}}');
-      {{/parentModel}}
-      {{/parent}}
-      {{#useInheritance}}
-      {{#parentModel}}
-      {{classname}}.constructFromObject(data, obj);
-      {{/parentModel}}
-      {{^parentModel}}
-      {{#interfaces}}
-      {{.}}.constructFromObject(data, obj);
-      {{/interfaces}}
-      {{/parentModel}}
-      {{/useInheritance}}
-      {{#vars}}
-      if (data.hasOwnProperty('{{baseName}}')) {
-        obj['{{baseName}}']{{{defaultValueWithParam}}}
-      }
-      {{/vars}}
-    }
-    return obj;
-  }
-{{/vendorExtensions.x-is-primitive}}
-{{#useInheritance}}{{#parentModel}}
-  exports.prototype = Object.create({{classname}}.prototype);
-  exports.prototype.constructor = exports;
-{{/parentModel}}{{/useInheritance}}
-{{#vars}}
-{{#emitJSDoc}}
-  /**{{#description}}
-   * {{{.}}}{{/description}}
-   * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
-   * @default {{{.}}}{{/defaultValue}}
-   */
-{{/emitJSDoc}}
-  exports.prototype['{{baseName}}'] = {{{defaultValue}}}{{^defaultValue}}undefined{{/defaultValue}};
-{{/vars}}{{#useInheritance}}{{#interfaceModels}}
-  // Implement {{classname}} interface:{{#allVars}}
-{{#emitJSDoc}}
-  /**{{#description}}
-   * {{{.}}}{{/description}}
-   * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
-   * @default {{{.}}}{{/defaultValue}}
-   */
-{{/emitJSDoc}}
-exports.prototype['{{baseName}}'] = {{{defaultValue}}}{{^defaultValue}}undefined{{/defaultValue}};
-{{/allVars}}{{/interfaceModels}}{{/useInheritance}}
-{{#emitModelMethods}}{{#vars}}
-{{#emitJSDoc}}
-  /**{{#description}}
-   * Returns {{{.}}}{{/description}}{{#minimum}}
-   * minimum: {{.}}{{/minimum}}{{#maximum}}
-   * maximum: {{.}}{{/maximum}}
-   * @return {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=>
-   */
-{{/emitJSDoc}}
-  exports.prototype.{{getter}} = function() {
-    return this['{{baseName}}'];
-  }
-
-{{#emitJSDoc}}
-  /**{{#description}}
-   * Sets {{{.}}}{{/description}}
-   * @param {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{name}}{{#description}} {{{.}}}{{/description}}
-   */
-{{/emitJSDoc}}
-  exports.prototype.{{setter}} = function({{name}}) {
-    this['{{baseName}}'] = {{name}};
-  }
-
-{{/vars}}{{/emitModelMethods}}
-{{#vars}}
-{{#isEnum}}
-{{^isContainer}}
-{{>partial_model_inner_enum}}
-{{/isContainer}}
-{{/isEnum}}
-{{#items.isEnum}}
-{{#items}}
-{{^isContainer}}
-{{>partial_model_inner_enum}}
-{{/isContainer}}
-{{/items}}
-{{/items.isEnum}}
-{{/vars}}
-
-  return exports;
-{{/model}}{{/models}}}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_inner_enum.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_inner_enum.mustache
deleted file mode 100644
index a8b981316d1c..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_inner_enum.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-{{#emitJSDoc}}
-  /**
-   * Allowed values for the <code>{{baseName}}</code> property.
-   * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
-   * @readonly
-   */
-{{/emitJSDoc}}
-  exports.{{datatypeWithEnum}} = {
-  {{#allowableValues}}
-  {{#enumVars}}
-{{#emitJSDoc}}
-    /**
-     * value: {{{value}}}
-     * @const
-     */
-{{/emitJSDoc}}
-    "{{name}}": {{{value}}}{{^-last}},
-    {{/-last}}
-  {{/enumVars}}
-  {{/allowableValues}}
-  };
diff --git a/modules/openapi-generator/src/main/resources/Javascript/travis.yml b/modules/openapi-generator/src/main/resources/Javascript/travis.yml
deleted file mode 100644
index 1b1103e7bd1b..000000000000
--- a/modules/openapi-generator/src/main/resources/Javascript/travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: node_js
-cache: npm
-node_js:
-  - "5"
-  - "5.11"