diff --git a/pom.xml b/pom.xml
index d27ee8f..68ad773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,16 +33,6 @@
 			<artifactId>gson</artifactId>
 			<version>2.13.1</version>
 		</dependency>
-		<dependency>
-		    <groupId>com.googlecode.json-simple</groupId>
-		    <artifactId>json-simple</artifactId>
-		    <version>1.1.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.yaml</groupId>
-		    <artifactId>snakeyaml</artifactId>
-		    <version>2.4</version>
-		</dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -53,11 +43,6 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>2.19.2</version>
         </dependency>
-		<dependency>
-		    <groupId>org.apache.commons</groupId>
-		    <artifactId>commons-lang3</artifactId>
-		    <version>3.18.0</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/cz/trask/migration/AbstractProcess.java b/src/main/java/cz/trask/migration/AbstractProcess.java
index 05c10a9..4722c06 100644
--- a/src/main/java/cz/trask/migration/AbstractProcess.java
+++ b/src/main/java/cz/trask/migration/AbstractProcess.java
@@ -17,8 +17,9 @@ import javax.net.ssl.HttpsURLConnection;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.yaml.snakeyaml.Yaml;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -37,7 +38,9 @@ public abstract class AbstractProcess {
 
 	protected Gson gson;
 
-	protected Yaml yaml;
+	protected ObjectMapper mapper;
+	
+	protected ObjectMapper mapperYaml;
 
 	protected ConfigManager config = ConfigManager.getInstance();
 
@@ -45,7 +48,8 @@ public abstract class AbstractProcess {
 
 		gson = new GsonBuilder().create();
 
-		yaml = new Yaml();
+		mapper = new ObjectMapper();
+		mapperYaml = new ObjectMapper(new YAMLFactory());
 
 		setTrustStoreCredentials();
 
diff --git a/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java b/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java
index b7ffb75..226289f 100644
--- a/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java
+++ b/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java
@@ -14,10 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.yaml.snakeyaml.Yaml;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
@@ -30,7 +27,6 @@ import cz.trask.migration.model.HttpResponse;
 import cz.trask.migration.model.RegisterResponse;
 import cz.trask.migration.model.TokenResponse;
 import cz.trask.migration.model.ZipEntryData;
-import cz.trask.migration.model.v32.ApiDefinition;
 import io.apicurio.registry.rest.client.RegistryClient;
 import io.apicurio.registry.rest.client.RegistryClientFactory;
 import io.apicurio.registry.rest.client.exception.VersionAlreadyExistsException;
@@ -177,7 +173,7 @@ public class ImportToApicurio extends AbstractProcess {
 					+ devPortUrl;
 
 			// 6) Update the swagger with the description and servers
-			Map<String, Object> swaggerMap = yaml.load(swagger);
+			Map<String, Object> swaggerMap = mapperYaml.readValue(swagger, Map.class);
 			JsonObject swaggerObj = gson.toJsonTree(swaggerMap).getAsJsonObject();
 			updateSwagger(swaggerObj, apiMap, fullDesc);
 
@@ -326,8 +322,7 @@ public class ImportToApicurio extends AbstractProcess {
 		for (ZipEntryData entry : zipEntries) {
 			String artifactId = api.getName() + "/" + api.getVersion() + "/" + entry.getName();
 			
-			ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-			ApiDefinition apiDef = mapper.readValue(entry.getContent(), ApiDefinition.class);
+			//ApiDefinition apiDef = mapper.readValue(entry.getContent(), ApiDefinition.class);
 
 			// Create the artifact (versioned)
 			try (ByteArrayInputStream is = new ByteArrayInputStream(entry.getContent())) {
diff --git a/src/main/java/cz/trask/migration/model/v32/API.java b/src/main/java/cz/trask/migration/model/v32/API.java
deleted file mode 100644
index 61580ac..0000000
--- a/src/main/java/cz/trask/migration/model/v32/API.java
+++ /dev/null
@@ -1,1073 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.json.simple.JSONObject;
-
-
-/**
- * Provider's & system's view of API
- */
-@SuppressWarnings("unused")
-public class API implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private APIIdentifier id;
-
-    // uuid of registry artifact
-    // this id is provider's username independent
-    private String uuid;
-
-    private String description;
-    private String url;
-    private String sandboxUrl;
-    private String wsdlUrl;
-    private String wsdlArchivePath;
-    private String wadlUrl;
-    private String swaggerDefinition;
-    private String graphQLSchema;
-    private String type;
-    private String context;
-    private String contextTemplate;
-    private String thumbnailUrl;
-    private ResourceFile wsdlResource;
-    private Set<String> tags = new LinkedHashSet<String>();
-    private Set<Documentation> documents = new LinkedHashSet<Documentation>();
-    private String httpVerb;
-    private Date lastUpdated;
-    private Set<Tier> availableTiers = new LinkedHashSet<Tier>();
-    private Set<Policy> availableSubscriptionLevelPolicies = new LinkedHashSet<Policy>();
-    private String apiLevelPolicy;
-    private AuthorizationPolicy authorizationPolicy;
-    private Set<URITemplate> uriTemplates = new LinkedHashSet<URITemplate>();
-
-    //dirty pattern to identify which parts to be updated
-    private boolean apiHeaderChanged;
-    private boolean apiResourcePatternsChanged;
-
-    private String status;
-
-    private String technicalOwner;
-    private String technicalOwnerEmail;
-    private String businessOwner;
-    private String businessOwnerEmail;
-
-    // Used for keeping Production & Sandbox Throttling limits.
-    private String productionMaxTps;
-    private String sandboxMaxTps;
-
-    private String visibility;
-    private String visibleRoles;
-    private String visibleTenants;
-
-    private List<Label> gatewayLabels;
-
-    private boolean endpointSecured = false;
-    private boolean endpointAuthDigest = false;
-    private String endpointUTUsername;
-    private String endpointUTPassword;
-
-    private String transports;
-    private String inSequence;
-    private String outSequence;
-    private String faultSequence;
-
-    private String oldInSequence;
-    private String oldOutSequence;
-    private String oldFaultSequence;
-
-    private boolean advertiseOnly;
-    private String apiOwner;
-    private String redirectURL;
-
-    private String subscriptionAvailability;
-    private String subscriptionAvailableTenants;
-    private CORSConfiguration corsConfiguration;
-    private String endpointConfig;
-
-    private String responseCache;
-    private int cacheTimeout;
-
-    private String implementation = "ENDPOINT";
-
-    private String monetizationCategory;
-
-    //Custom authorization header specific to the API
-    private String authorizationHeader;
-    private Set<Scope> scopes;
-
-    private boolean isDefaultVersion = false;
-    private boolean isPublishedDefaultVersion = false;
-    private List<String> keyManagers = new ArrayList<>();
-    /**
-     * Used to set the workflow status in lifecycle state change workflow
-     */
-    private String workflowStatus = null;
-
-    private Set<String> environments;
-
-    private String createdTime;
-    /**
-     * Customized properties relevant to the particular API.
-     */
-    private JSONObject additionalProperties;
-
-    /**
-     * Properties relevant to monetization of the particular API.
-     */
-    private JSONObject monetizationProperties = new JSONObject();
-
-    /**
-     * Property to indicate the monetization status of the particular API.
-     */
-    private boolean isMonetizationEnabled = false;
-
-    /**
-     * Property to hold selected deployment environments of the  particular API.
-     */
-    private Set<DeploymentEnvironments> deploymentEnvironments;
-
-    // Used for endpoint environments configured with non empty URLs
-    private Set<String> environmentList;
-
-    // API security at the gateway level.
-    private String apiSecurity = "oauth2";
-
-    private static final String NULL_VALUE = "NULL";
-
-    private List<APIEndpoint> endpoints = new ArrayList<APIEndpoint>();
-
-    /**
-     * Property to hold the enable/disable status of the json schema validation.
-     */
-    private boolean enableSchemaValidation = false;
-
-    private List<APICategory> apiCategories;
-
-    /**
-     * Property to hold enable/disable status of the store visibility.
-     */
-    private boolean enableStore = true;
-
-    private String testKey;
-
-
-    public void setEnvironmentList(Set<String> environmentList) {
-        this.environmentList = environmentList;
-    }
-
-    public Set<String> getEnvironmentList() {
-        return environmentList;
-    }
-
-    /**
-     * To get the additional properties
-     *
-     * @return additional properties of the API
-     */
-    public JSONObject getAdditionalProperties() {
-        return additionalProperties;
-    }
-
-    /**
-     * To assign a set of customized properties to the API.
-     *
-     * @param properties Properties that need to be assigned to.
-     */
-    public void setAdditionalProperties(JSONObject properties) {
-        this.additionalProperties = properties;
-    }
-
-    /**
-     * This method is used to get the properties related to monetization
-     *
-     * @return properties related to monetization
-     */
-    public JSONObject getMonetizationProperties() {
-        return monetizationProperties;
-    }
-
-    /**
-     * This method is used to get the monetization status (true or false)
-     *
-     * @return flag to indicate the monetization status (true or false)
-     */
-    public boolean getMonetizationStatus() {
-        return isMonetizationEnabled;
-    }
-
-    /**
-     * This method is used to set the monetization status (true or false)
-     *
-     * @param monetizationStatus flag to indicate the monetization status (true or false)
-     */
-    public void setMonetizationStatus(boolean monetizationStatus) {
-        this.isMonetizationEnabled = monetizationStatus;
-    }
-
-    /**
-     * This method is used to set the monetization properties
-     *
-     * @param monetizationProperties properties related to monetization
-     */
-    public void setMonetizationProperties(JSONObject monetizationProperties) {
-        this.monetizationProperties = monetizationProperties;
-    }
-
-    /**
-     * This method is used to add monetization property
-     *
-     * @param key   key of the monetization property
-     * @param value applicable value of the monetization property
-     */
-    public void addMonetizationProperty(String key, String value) {
-        monetizationProperties.put(key, value);
-    }
-
-    /**
-     * To add a new property to additional properties list.
-     *
-     * @param key   Name of the property.
-     * @param value Value of the property.
-     */
-    public void addProperty(String key, String value) {
-        additionalProperties.put(key, value);
-    }
-
-    /**
-     * To get the value of the property.
-     *
-     * @param key Name of the property
-     * @return value of the property.
-     */
-    public String getProperty(String key) {
-        return additionalProperties.get(key).toString();
-    }
-
-    /**
-     * Publisher access control related parameters.
-     * AccessControl -> Specifies whether that particular API is restricted to certain set of publishers and creators.
-     * AccessControlRoles -> Specifies the roles that the particular API is visible to.
-     */
-    private String accessControl;
-    private String accessControlRoles;
-
-    public String getSwaggerDefinition() {
-        return swaggerDefinition;
-    }
-
-    public void setSwaggerDefinition(String swaggerDefinition) {
-        this.swaggerDefinition = swaggerDefinition;
-    }
-
-    public void setGraphQLSchema(String graphQLSchema) {
-        this.graphQLSchema = graphQLSchema;
-    }
-
-    public String getGraphQLSchema() {
-        return graphQLSchema;
-    }
-
-    public Set<String> getEnvironments() {
-        return environments;
-    }
-
-    public void setEnvironments(Set<String> environments) {
-        this.environments = environments;
-    }
-
-    /**
-     * Contains flag indicating whether dummy backend or not
-     *
-     * @return
-     */
-    public String getImplementation() {
-        return implementation;
-    }
-
-    /**
-     * Returns flag indicating whether dummy backend or not
-     *
-     * @param implementation
-     */
-    public void setImplementation(String implementation) {
-        this.implementation = implementation;
-    }
-
-    /**
-     * The average rating provided by the API subscribers
-     */
-    private float rating;
-
-    private boolean isLatest;
-
-    //TODO: missing - total user count, up time statistics,tier
-
-    public String getUUID() {
-        return uuid;
-    }
-
-    public void setUUID(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getProductionMaxTps() {
-        return productionMaxTps;
-    }
-
-    public void setProductionMaxTps(String productionMaxTps) {
-        this.productionMaxTps = productionMaxTps;
-    }
-
-    public String getSandboxMaxTps() {
-        return sandboxMaxTps;
-    }
-
-    public void setSandboxMaxTps(String sandboxMaxTps) {
-        this.sandboxMaxTps = sandboxMaxTps;
-    }
-
-    public boolean isAdvertiseOnly() {
-        return advertiseOnly;
-    }
-
-    public void setAdvertiseOnly(boolean advertiseOnly) {
-        this.advertiseOnly = advertiseOnly;
-    }
-
-    public String getApiOwner() {
-        return apiOwner;
-    }
-
-    public void setApiOwner(String apiOwner) {
-        this.apiOwner = apiOwner;
-    }
-
-    public String getRedirectURL() {
-        return redirectURL;
-    }
-
-    public void setRedirectURL(String redirectURL) {
-        this.redirectURL = redirectURL;
-    }
-
-    public API(APIIdentifier id) {
-        this.id = id;
-        additionalProperties = new JSONObject();
-    }
-
-    public APIIdentifier getId() {
-        return id;
-    }
-
-    public void setId(APIIdentifier id) {
-        this.id = id;
-    }
-
-    public String getTransports() {
-        return transports;
-    }
-
-    public void setTransports(String transports) {
-        this.transports = transports;
-    }
-
-    public String getTechnicalOwner() {
-        return technicalOwner;
-    }
-
-    public void setTechnicalOwner(String technicalOwner) {
-        this.technicalOwner = technicalOwner;
-    }
-
-    public String getTechnicalOwnerEmail() {
-        return technicalOwnerEmail;
-    }
-
-    public void setTechnicalOwnerEmail(String technicalOwnerEmail) {
-        this.technicalOwnerEmail = technicalOwnerEmail;
-    }
-
-    public String getBusinessOwner() {
-        return businessOwner;
-    }
-
-    public void setBusinessOwner(String businessOwner) {
-        this.businessOwner = businessOwner;
-    }
-
-    public String getBusinessOwnerEmail() {
-        return businessOwnerEmail;
-    }
-
-    public void setBusinessOwnerEmail(String businessOwnerEmail) {
-        this.businessOwnerEmail = businessOwnerEmail;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getSandboxUrl() {
-        return sandboxUrl;
-    }
-
-    public void setSandboxUrl(String sandboxUrl) {
-        this.sandboxUrl = sandboxUrl;
-    }
-
-    public String getWsdlUrl() {
-        return wsdlUrl;
-    }
-
-    public void setContext(String context) {
-        this.context = context;
-    }
-
-    public String getContext() {
-        return context;
-    }
-
-    public void setContextTemplate(String contextTemplate) {
-        this.contextTemplate = contextTemplate;
-    }
-
-    public String getContextTemplate() {
-        return contextTemplate;
-    }
-
-    public void setWsdlUrl(String wsdlUrl) {
-        this.wsdlUrl = wsdlUrl;
-    }
-
-    public String getThumbnailUrl() {
-        return thumbnailUrl;
-    }
-
-    public void setThumbnailUrl(String thumbnailUrl) {
-        this.thumbnailUrl = thumbnailUrl;
-    }
-
-    public Set<String> getTags() {
-        return Collections.unmodifiableSet(tags);
-    }
-
-    public void addTags(Set<String> tags) {
-        this.tags.addAll(tags);
-    }
-
-    public void removeTags(Set<String> tags) {
-        this.tags.removeAll(tags);
-    }
-
-    public Set<Documentation> getDocuments() {
-        return Collections.unmodifiableSet(documents);
-    }
-
-    public void addDocuments(Set<Documentation> documents) {
-        this.documents.addAll(documents);
-    }
-
-    public void removeDocuments(Set<Documentation> documents) {
-        this.documents.removeAll(documents);
-    }
-
-    public String getHttpVerb() {
-        return httpVerb;
-    }
-
-    public void setHttpVerb(String httpVerb) {
-        this.httpVerb = httpVerb;
-    }
-
-    public Date getLastUpdated() {
-        return new Date(lastUpdated.getTime());
-    }
-
-    public void setLastUpdated(Date lastUpdated) {
-        this.lastUpdated = new Date(lastUpdated.getTime());
-    }
-
-    public Set<Tier> getAvailableTiers() {
-        return Collections.unmodifiableSet(availableTiers);
-    }
-
-    public void addAvailableTiers(Set<Tier> availableTiers) {
-        this.availableTiers.addAll(availableTiers);
-    }
-
-    /**
-     * Removes all Tiers from the API object.
-     */
-    public void removeAllTiers() {
-        availableTiers.clear();
-    }
-
-    /**
-     * Removes all Policies from the API object.
-     */
-    public void removeAllPolicies() {
-        availableSubscriptionLevelPolicies.clear();
-    }
-
-    public void removeAvailableTiers(Set<Tier> availableTiers) {
-        this.availableTiers.removeAll(availableTiers);
-    }
-
-    public Set<URITemplate> getUriTemplates() {
-        return uriTemplates;
-    }
-
-    public void setUriTemplates(Set<URITemplate> uriTemplates) {
-        this.uriTemplates = uriTemplates;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setStatus(APIStatus status) {
-        this.status = status.getStatus();
-    }
-
-    public float getRating() {
-        return rating;
-    }
-
-    public void setRating(float rating) {
-        this.rating = rating;
-    }
-
-    public void setLatest(boolean latest) {
-        isLatest = latest;
-    }
-
-    /**
-     * @return true if the current version of the API is the latest
-     */
-    public boolean isLatest() {
-        return isLatest;
-    }
-
-    public AuthorizationPolicy getAuthorizationPolicy() {
-        return authorizationPolicy;
-    }
-
-    public void setAuthorizationPolicy(AuthorizationPolicy authorizationPolicy) {
-        this.authorizationPolicy = authorizationPolicy;
-    }
-
-    public String getWadlUrl() {
-        return wadlUrl;
-    }
-
-    public void setWadlUrl(String wadlUrl) {
-        this.wadlUrl = wadlUrl;
-    }
-
-    public String getVisibility() {
-        return visibility;
-    }
-
-    public void setVisibility(String visibility) {
-        this.visibility = visibility;
-    }
-
-    public String getVisibleRoles() {
-        return visibleRoles;
-    }
-
-    public void setVisibleRoles(String visibleRoles) {
-        this.visibleRoles = visibleRoles;
-    }
-
-    public String getVisibleTenants() {
-        return visibleTenants;
-    }
-
-    public void setVisibleTenants(String visibleTenants) {
-        this.visibleTenants = visibleTenants;
-    }
-
-    public List<Label> getGatewayLabels() {
-        return gatewayLabels;
-    }
-
-    public void setGatewayLabels(List<Label> gatewayLabels) {
-        this.gatewayLabels = gatewayLabels;
-    }
-
-    public boolean isApiHeaderChanged() {
-        return apiHeaderChanged;
-    }
-
-    public void setApiHeaderChanged(boolean apiHeaderChanged) {
-        this.apiHeaderChanged = apiHeaderChanged;
-    }
-
-    public boolean isApiResourcePatternsChanged() {
-        return apiResourcePatternsChanged;
-    }
-
-    public void setApiResourcePatternsChanged(boolean apiResourcePatternsChanged) {
-        this.apiResourcePatternsChanged = apiResourcePatternsChanged;
-    }
-
-    /**
-     * @return the endpointUTUsername
-     */
-    public String getEndpointUTUsername() {
-        return endpointUTUsername;
-    }
-
-    /**
-     * @param endpointUTUsername the endpointUTUsername to set
-     */
-    public void setEndpointUTUsername(String endpointUTUsername) {
-        this.endpointUTUsername = endpointUTUsername;
-    }
-
-    /**
-     * @return the endpointUTPassword
-     */
-    public String getEndpointUTPassword() {
-        return endpointUTPassword;
-    }
-
-    /**
-     * @param endpointUTPassword the endpointUTPassword to set
-     */
-    public void setEndpointUTPassword(String endpointUTPassword) {
-        this.endpointUTPassword = endpointUTPassword;
-    }
-
-    /**
-     * @return the endpointSecured
-     */
-    public boolean isEndpointSecured() {
-        return endpointSecured;
-    }
-
-    /**
-     * @param endpointSecured the endpointSecured to set
-     */
-    public void setEndpointSecured(boolean endpointSecured) {
-        this.endpointSecured = endpointSecured;
-    }
-
-    /**
-     * @return the endpointAuthDigest
-     */
-    public boolean isEndpointAuthDigest() {
-        return endpointAuthDigest;
-    }
-
-    /**
-     * @param endpointAuthDigest the endpointAuthDigest to set
-     */
-    public void setEndpointAuthDigest(boolean endpointAuthDigest) {
-        this.endpointAuthDigest = endpointAuthDigest;
-    }
-
-    public String getInSequence() {
-        return inSequence;
-    }
-
-    /**
-     * @param inSeq insequence for the API
-     */
-    public void setInSequence(String inSeq) {
-        this.inSequence = inSeq;
-    }
-
-    public String getOutSequence() {
-        return outSequence;
-    }
-
-    /**
-     * @param outSeq outSequence for the API
-     */
-    public void setOutSequence(String outSeq) {
-        this.outSequence = outSeq;
-    }
-
-    /**
-     * remove custom sequences from api object
-     */
-    public void removeCustomSequences() {
-        this.inSequence = null;
-        this.outSequence = null;
-        this.faultSequence = null;
-    }
-
-    public String getOldInSequence() {
-        return oldInSequence;
-    }
-
-    public void setOldInSequence(String oldInSequence) {
-        this.oldInSequence = oldInSequence;
-    }
-
-    public String getOldOutSequence() {
-        return oldOutSequence;
-    }
-
-    public void setOldOutSequence(String oldOutSequence) {
-        this.oldOutSequence = oldOutSequence;
-    }
-
-    public String getSubscriptionAvailability() {
-        return subscriptionAvailability;
-    }
-
-    public void setSubscriptionAvailability(String subscriptionAvailability) {
-        this.subscriptionAvailability = subscriptionAvailability;
-    }
-
-    public String getSubscriptionAvailableTenants() {
-        return subscriptionAvailableTenants;
-    }
-
-    public void setSubscriptionAvailableTenants(String subscriptionAvailableTenants) {
-        this.subscriptionAvailableTenants = subscriptionAvailableTenants;
-    }
-
-    public String getEndpointConfig() {
-        // This is to support new Endpoint object
-        if ((endpointConfig == null || StringUtils.isAllEmpty(endpointConfig) && endpoints.size() > 0)) {
-            return getEndpointConfigString(endpoints);
-        }
-        return endpointConfig;
-    }
-
-    public void setEndpointConfig(String endpointConfig) {
-        this.endpointConfig = endpointConfig;
-    }
-
-    public String getResponseCache() {
-        return responseCache;
-    }
-
-    public void setResponseCache(String responseCache) {
-        this.responseCache = responseCache;
-    }
-
-    public int getCacheTimeout() {
-        return cacheTimeout;
-    }
-
-    public void setCacheTimeout(int cacheTimeout) {
-        this.cacheTimeout = cacheTimeout;
-    }
-
-    public String getFaultSequence() {
-        return faultSequence;
-    }
-
-    public void setFaultSequence(String faultSequence) {
-        this.faultSequence = faultSequence;
-    }
-
-    public String getOldFaultSequence() {
-        return oldFaultSequence;
-    }
-
-    public void setOldFaultSequence(String oldFaultSequence) {
-        this.oldFaultSequence = oldFaultSequence;
-    }
-
-    public Set<Scope> getScopes() {
-        return scopes;
-    }
-
-    public void setScopes(Set<Scope> scopes) {
-        this.scopes = scopes;
-    }
-
-    public void setAsDefaultVersion(boolean value) {
-        isDefaultVersion = value;
-    }
-
-    public void setAsPublishedDefaultVersion(boolean value) {
-        isPublishedDefaultVersion = value;
-    }
-
-    public boolean isDefaultVersion() {
-        return isDefaultVersion;
-    }
-
-    public boolean isPublishedDefaultVersion() {
-        return isPublishedDefaultVersion;
-    }
-
-    public CORSConfiguration getCorsConfiguration() {
-        return corsConfiguration;
-    }
-
-    public void setCorsConfiguration(CORSConfiguration corsConfiguration) {
-        this.corsConfiguration = corsConfiguration;
-    }
-
-    public String getMonetizationCategory() {
-        return this.monetizationCategory;
-    }
-
-    public void setMonetizationCategory(String monetizationCategory) {
-        this.monetizationCategory = monetizationCategory;
-    }
-
-    public String getApiLevelPolicy() {
-        return apiLevelPolicy;
-    }
-
-    public void setApiLevelPolicy(String apiLevelPolicy) {
-        this.apiLevelPolicy = apiLevelPolicy;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        if (StringUtils.isEmpty(type) || NULL_VALUE.equalsIgnoreCase(StringUtils.trim(type))) {
-            this.type = "HTTP";
-        } else {
-            this.type = StringUtils.trim(type).toUpperCase();
-        }
-    }
-
-    public String getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(String createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public String getAccessControlRoles() {
-        return accessControlRoles;
-    }
-
-    public void setAccessControlRoles(String accessControlRoles) {
-        this.accessControlRoles = accessControlRoles;
-    }
-
-    public String getAccessControl() {
-        return accessControl;
-    }
-
-    public void setAccessControl(String accessControl) {
-        this.accessControl = accessControl;
-    }
-
-    public String getAuthorizationHeader() {
-        return authorizationHeader;
-    }
-
-    public void setAuthorizationHeader(String authorizationHeader) {
-        this.authorizationHeader = authorizationHeader;
-    }
-
-    /**
-     * Check the status of the Json schema validation property.
-     *
-     * @return Status of the validator property.
-     */
-    public boolean isEnabledSchemaValidation() {
-        return enableSchemaValidation;
-    }
-
-    /**
-     * To set the JSON schema validation enable/disable.
-     *
-     * @param enableSchemaValidation Given Status.
-     */
-    public void setEnableSchemaValidation(boolean enableSchemaValidation) {
-        this.enableSchemaValidation = enableSchemaValidation;
-    }
-
-    /**
-     * To set the gateway security for the relevant API.
-     *
-     * @param apiSecurity Relevant type of gateway security for the API.
-     */
-    public void setApiSecurity(String apiSecurity) {
-        if (apiSecurity != null) {
-            this.apiSecurity = apiSecurity;
-        }
-    }
-
-    /**
-     * To get the gateway level security specific to the relevant API.
-     *
-     * @return Relevant type of gateway security.
-     */
-    public String getApiSecurity() {
-        return apiSecurity;
-    }
-
-    public String getWsdlArchivePath() {
-        return wsdlArchivePath;
-    }
-
-    public void setWsdlArchivePath(String wsdlArchivePath) {
-        this.wsdlArchivePath = wsdlArchivePath;
-    }
-
-    public ResourceFile getWsdlResource() {
-        return wsdlResource;
-    }
-
-    public void setWsdlResource(ResourceFile wsdl) {
-        this.wsdlResource = wsdl;
-    }
-
-    public String getWorkflowStatus() {
-        return workflowStatus;
-    }
-
-    public void setWorkflowStatus(String workflowStatus) {
-        this.workflowStatus = workflowStatus;
-    }
-
-    public List<APIEndpoint> getEndpoint() {
-
-        return endpoints;
-    }
-
-    public void setEndpoint(List<APIEndpoint> endpoint) {
-
-        this.endpoints = endpoint;
-    }
-
-    public boolean isEnableStore() {
-        return enableStore;
-    }
-
-    public void setEnableStore(boolean enableStore) {
-        this.enableStore = enableStore;
-    }
-
-
-    public String getTestKey() {
-        return testKey;
-    }
-
-    public void setTestKey(String testKey) {
-        this.testKey = testKey;
-    }
-
-    /**
-     * This method returns endpoints according to the given endpoint config
-     *
-     * @param endpoints list of endpoints given
-     * @return String endpoint config
-     */
-    public static String getEndpointConfigString(List<APIEndpoint> endpoints) {
-        //todo improve this logic to support multiple endpoints such as failorver and load balance
-        StringBuilder sb = new StringBuilder();
-        if (endpoints != null && endpoints.size() > 0) {
-            sb.append("{");
-            for (APIEndpoint endpoint : endpoints) {
-                sb.append("\"")
-                        .append(endpoint.getType())
-                        .append("\": {\"url\":\"")
-                        .append(endpoint.getInline().getEndpointConfig().getList().get(0).getUrl())
-                        .append("\",\"timeout\":\"")
-                        .append(endpoint.getInline().getEndpointConfig().getList().get(0).getTimeout())
-                        .append("\",\"key\":\"")
-                        .append(endpoint.getKey())
-                        .append("\"},");
-            }
-            sb.append("\"endpoint_type\" : \"")
-                    .append(endpoints.get(0).getInline().getType())//assuming all the endpoints are same type
-                    .append("\"}\n");
-        }
-        return sb.toString();
-    }
-
-    public void setApiCategories(List<APICategory> apiCategories) {
-        this.apiCategories = apiCategories;
-    }
-
-    public List<APICategory> getApiCategories() {
-        return apiCategories;
-    }
-
-    public List<String> getKeyManagers() {
-
-        return keyManagers;
-    }
-
-    public void setKeyManagers(List<String> keyManagers) {
-
-        this.keyManagers = keyManagers;
-    }
-
-    public Set<DeploymentEnvironments> getDeploymentEnvironments() {
-        return deploymentEnvironments;
-    }
-
-    public void setDeploymentEnvironments(Set<DeploymentEnvironments> deploymentEnvironments) {
-        this.deploymentEnvironments = deploymentEnvironments;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) return true;
-
-        if (!(o instanceof API)) {
-            return false;
-        }
-
-        return Objects.equals(id, ((API) o).id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/APICategory.java b/src/main/java/cz/trask/migration/model/v32/APICategory.java
deleted file mode 100644
index 6446316..0000000
--- a/src/main/java/cz/trask/migration/model/v32/APICategory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package cz.trask.migration.model.v32;
-
-/**
- * This class represents API Categories
- */
-public class APICategory {
-    private String id;
-    private String name;
-    private String description;
-    private int numberOfAPIs;
-    private int tenantID;
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setTenantID(int tenantID) {
-        this.tenantID = tenantID;
-    }
-
-    public int getTenantID() {
-        return tenantID;
-    }
-
-    public void setNumberOfAPIs(int numberOfAPIs) {
-        this.numberOfAPIs = numberOfAPIs;
-    }
-
-    public int getNumberOfAPIs() {
-        return numberOfAPIs;
-    }
-
-    /**
-     * Name,TenantID combination is unique and cannot be duplicated. Hence two API category objects t1 and t2 are
-     * considered equal if both have the same name and same tenant id
-     *
-     * @param obj
-     * @return
-     */
-    public boolean equals(Object obj) {
-        return this.tenantID == ((APICategory)obj).getTenantID() && this.getName().equals(((APICategory) obj).getName());
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/APIEndpoint.java b/src/main/java/cz/trask/migration/model/v32/APIEndpoint.java
deleted file mode 100644
index 30df0e2..0000000
--- a/src/main/java/cz/trask/migration/model/v32/APIEndpoint.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-public class APIEndpoint {
-
-    private Endpoint inline = null;
-
-    private String type = null;
-
-    private String key = null;
-
-    public Endpoint getInline() {
-
-        return inline;
-    }
-
-    public void setInline(Endpoint inline) {
-
-        this.inline = inline;
-    }
-
-    public String getType() {
-
-        return type;
-    }
-
-    public void setType(String type) {
-
-        this.type = type;
-    }
-
-    public String getKey() {
-
-        return key;
-    }
-
-    public void setKey(String key) {
-
-        this.key = key;
-    }
-
-    @Override
-    public String toString() {
-
-        return "APIEndpoint{" +
-                "inline=" + inline +
-                ", type='" + type + '\'' +
-                ", key='" + key + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/APIIdentifier.java b/src/main/java/cz/trask/migration/model/v32/APIIdentifier.java
deleted file mode 100644
index eb9715f..0000000
--- a/src/main/java/cz/trask/migration/model/v32/APIIdentifier.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-
-/**
- * An API can be uniquely identified by a combination of providerName,apiName & version.
- * This class represents this unique identifier.
- */
-@SuppressWarnings("unused")
-public class APIIdentifier implements Serializable, Identifier {
-
-    private static final long serialVersionUID = 1L;
-
-    private final String providerName;
-    private final String apiName;
-    private final String version;
-    private String tier;
-    private String applicationId;
-    private String uuid;
-    private int id;
-
-    public String getApplicationId() {
-        return applicationId;
-    }
-
-    public void setApplicationId(String applicationId) {
-        this.applicationId = applicationId;
-    }
-
-    public String getTier() {
-        return tier;
-    }
-
-    public void setTier(String tier) {
-        this.tier = tier;
-    }
-
-    public APIIdentifier(String providerName, String apiName, String version) {
-        this.providerName = providerName;
-        this.apiName = apiName;
-        this.version = version;
-    }
-
-    public APIIdentifier(String apiId) throws Exception {
-        //eg: apiId = "P1_API1_v1.0.0"
-        String[] split = apiId.split("_");
-        if (split.length == 3) {
-            this.providerName = split[0];
-            this.apiName = split[1];
-            this.version = split[2];
-        } else {
-            throw new Exception("Invalid API ID : " + apiId);
-        }
-    }
-
-    public String getProviderName() {
-        return providerName;
-    }
-
-    public String getApiName() {
-        return apiName;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        APIIdentifier that = (APIIdentifier) o;
-
-        return apiName.equals(that.apiName) && providerName.equals(that.providerName) &&
-                version.equals(that.version);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = providerName.hashCode();
-        result = 31 * result + apiName.hashCode();
-        result = 31 * result + version.hashCode();
-        return result;
-    }
-    
-    @Override
-    public String toString() {
-    	return this.getProviderName() + '-' + this.getName() + '-' + this.getVersion();
-    }
-
-    @Override
-    public String getName() {
-        return apiName;
-    }
-
-    @Override
-    public String getUUID() {
-        return uuid;
-    }
-    
-    @Override
-    public int getId() {
-        return id;
-    }
-    
-    public void setId(int id) {
-        this.id = id;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/APIProductIdentifier.java b/src/main/java/cz/trask/migration/model/v32/APIProductIdentifier.java
deleted file mode 100644
index 7d7dd66..0000000
--- a/src/main/java/cz/trask/migration/model/v32/APIProductIdentifier.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * API Product identifier. 
- *
- */
-public class APIProductIdentifier implements Serializable, Identifier {
-
-    private static final long serialVersionUID = 1L;
-    
-    private final String providerName;
-    private final String apiProductName;
-    //In this initial api product implementation versioning is not supported, we are setting a default version to all api products
-    //however we will create these models in such a way so that versioning can be easily introduced later.
-    private final String version;
-    private String tier;
-    private String applicationId;
-    private String uuid;
-    private int productId;
-    
-    public APIProductIdentifier(String providerName, String apiProductName, String version){
-        this.apiProductName = apiProductName;
-        this.providerName = providerName;
-        this.version = "1.0.0";
-    }
-
-    public String getTier() {
-        return tier;
-    }
-
-    public void setTier(String tier) {
-        this.tier = tier;
-    }
-
-    public String getApplicationId() {
-        return applicationId;
-    }
-
-    public void setApplicationId(String applicationId) {
-        this.applicationId = applicationId;
-    }
-
-    public void setUUID(String uuid) {
-        this.uuid = uuid;
-    }
-    
-    public int getProductId() {
-        return productId;
-    }
-
-    public void setProductId(int productId) {
-        this.productId = productId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-
-        if (!(o instanceof APIProductIdentifier)) {
-            return false;
-        }
-
-        APIProductIdentifier that = (APIProductIdentifier) o;
-
-        return Objects.equals(apiProductName, that.apiProductName) &&
-                Objects.equals(providerName, that.providerName) &&
-                Objects.equals(version, that.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(providerName, apiProductName, version);
-    }
-    
-    @Override
-    public String toString() {
-        return this.getProviderName() + '-' + this.getName();
-    }
-
-    @Override
-    public String getName() {
-        // API name of the product is the product name
-        return apiProductName;
-    }
-
-    @Override
-    public String getVersion() {
-        return version;
-    }
-
-    @Override
-    public String getUUID() {
-        return uuid;
-    }
-
-    @Override
-    public String getProviderName() {
-        return providerName;
-    }
-    
-    @Override
-    public int getId() {
-        return productId;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/APIStatus.java b/src/main/java/cz/trask/migration/model/v32/APIStatus.java
deleted file mode 100644
index 76fb015..0000000
--- a/src/main/java/cz/trask/migration/model/v32/APIStatus.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-/**
- * Status of an API can be anyone from following list.
- */
-public enum APIStatus {
-
-    CREATED("CREATED"), PUBLISHED("PUBLISHED"),
-    DEPRECATED("DEPRECATED"), RETIRED("RETIRED"), BLOCKED("BLOCKED"), PROTOTYPED("PROTOTYPED");
-
-    private String status;
-
-    APIStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/AuthorizationPolicy.java b/src/main/java/cz/trask/migration/model/v32/AuthorizationPolicy.java
deleted file mode 100644
index 6790b25..0000000
--- a/src/main/java/cz/trask/migration/model/v32/AuthorizationPolicy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-
-/**
- * Authorization Policy associated with a given API.
- */
-@SuppressWarnings("unused")
-public class AuthorizationPolicy implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    private String policyURL;
-
-    public AuthorizationPolicy(String policyURL) {
-        this.policyURL = policyURL;
-    }
-
-    public String getPolicyURL() {
-        return policyURL;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/CORSConfiguration.java b/src/main/java/cz/trask/migration/model/v32/CORSConfiguration.java
deleted file mode 100644
index 133f44e..0000000
--- a/src/main/java/cz/trask/migration/model/v32/CORSConfiguration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-*  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.util.List;
-import java.util.List;
-
-/**
- * API CORS Configuration
- */
-public class CORSConfiguration {
-
-    private boolean corsConfigurationEnabled;
-    private List<String> accessControlAllowOrigins;
-    private boolean accessControlAllowCredentials;
-    private List<String> accessControlAllowHeaders;
-    private List<String> accessControlAllowMethods;
-
-    public CORSConfiguration(boolean corsConfigurationEnabled, List<String> accessControlAllowOrigins,
-                             boolean accessControlAllowCredentials,
-                             List<String> accessControlAllowHeaders, List<String> accessControlAllowMethods) {
-        this.corsConfigurationEnabled = corsConfigurationEnabled;
-        this.accessControlAllowOrigins = accessControlAllowOrigins;
-        this.accessControlAllowCredentials = accessControlAllowCredentials;
-        this.accessControlAllowHeaders = accessControlAllowHeaders;
-        this.accessControlAllowMethods = accessControlAllowMethods;
-    }
-
-    public boolean isCorsConfigurationEnabled() {
-        return corsConfigurationEnabled;
-    }
-
-    public void setCorsConfigurationEnabled(boolean corsConfigurationEnabled) {
-        this.corsConfigurationEnabled = corsConfigurationEnabled;
-    }
-
-    public List<String> getAccessControlAllowOrigins() {
-        return accessControlAllowOrigins;
-    }
-
-    public void setAccessControlAllowOrigins(List<String> accessControlAllowOrigins) {
-        this.accessControlAllowOrigins = accessControlAllowOrigins;
-    }
-
-    public boolean isAccessControlAllowCredentials() {
-        return accessControlAllowCredentials;
-    }
-
-    public void setAccessControlAllowCredentials(boolean accessControlAllowCredentials) {
-        this.accessControlAllowCredentials = accessControlAllowCredentials;
-    }
-
-    public List<String> getAccessControlAllowHeaders() {
-        return accessControlAllowHeaders;
-    }
-
-    public void setAccessControlAllowHeaders(List<String> accessControlAllowHeaders) {
-        this.accessControlAllowHeaders = accessControlAllowHeaders;
-    }
-
-    public List<String> getAccessControlAllowMethods() {
-        return accessControlAllowMethods;
-    }
-
-    public void setAccessControlAllowMethods(List<String> accessControlAllowMethods) {
-        this.accessControlAllowMethods = accessControlAllowMethods;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/ConditionDTO.java b/src/main/java/cz/trask/migration/model/v32/ConditionDTO.java
deleted file mode 100644
index 0984cb6..0000000
--- a/src/main/java/cz/trask/migration/model/v32/ConditionDTO.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- *   Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. licenses this file to you under the Apache License,
- *   Version 2.0 (the "License"); you may not use this file except
- *   in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- * /
- */
-
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-
-/**
- * This DTO used to represent a specific condition inside a Condition Group. This is analogous to {@code Condition}
- * object.
- */
-public class ConditionDTO implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    private String conditionType;
-    private String conditionName;
-    private String conditionValue;
-    private boolean isInverted;
-
-    public String getConditionType() {
-        return conditionType;
-    }
-
-    public String getConditionName() {
-        return conditionName;
-    }
-
-    public void setConditionName(String conditionName) {
-        this.conditionName = conditionName;
-    }
-
-    public String getConditionValue() {
-        return conditionValue;
-    }
-
-    public void setConditionValue(String conditionValue) {
-        this.conditionValue = conditionValue;
-    }
-
-    public boolean isInverted() {
-        return isInverted;
-    }
-
-    public void setConditionType(String conditionType) {
-        this.conditionType = conditionType;
-    }
-
-    public void isInverted(boolean invertCondition) {
-        this.isInverted = invertCondition;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/ConditionGroupDTO.java b/src/main/java/cz/trask/migration/model/v32/ConditionGroupDTO.java
deleted file mode 100644
index 37e0fd9..0000000
--- a/src/main/java/cz/trask/migration/model/v32/ConditionGroupDTO.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- *   Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. licenses this file to you under the Apache License,
- *   Version 2.0 (the "License"); you may not use this file except
- *   in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- * /
- */
-
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-
-/**
- * DTO used to represent a ConditionGroup. This is analogous to {@code Pipeline} class and has a subset of attributes
- * defined in that.
- */
-public class ConditionGroupDTO implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    private String conditionGroupId;
-    private ConditionDTO [] conditions;
-
-    public String getConditionGroupId() {
-        return conditionGroupId;
-    }
-
-    public void setConditionGroupId(String conditionGroupId) {
-        this.conditionGroupId = conditionGroupId;
-    }
-
-    public ConditionDTO[] getConditions() {
-        return conditions;
-    }
-
-    public void setConditions(ConditionDTO[] conditions) {
-        this.conditions = conditions;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/DeploymentEnvironments.java b/src/main/java/cz/trask/migration/model/v32/DeploymentEnvironments.java
deleted file mode 100644
index 9ac7b6c..0000000
--- a/src/main/java/cz/trask/migration/model/v32/DeploymentEnvironments.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  WSO2 Inc. licenses this file to you under the Apache License,
- *  Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cz.trask.migration.model.v32;
-
-import java.util.List;
-import java.util.Map;
-
-public class DeploymentEnvironments {
-    //use this class to build the model for selected deployment environments
-    private String type;
-    private List<String> clusterNames;
-
-    public DeploymentEnvironments(String type, List<String> clusterNames) {
-        this.type = type;
-        this.clusterNames = clusterNames;
-    }
-
-    public DeploymentEnvironments() {
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public List<String> getClusterNames() {
-        return clusterNames;
-    }
-
-    public void setClusterNames(List<String> clusterNames) {
-        this.clusterNames = clusterNames;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Documentation.java b/src/main/java/cz/trask/migration/model/v32/Documentation.java
deleted file mode 100644
index 9438716..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Documentation.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Documentation for API. There can be several types of documentation. Refer {@link DocumentationType}.
- *
- * @see DocumentationType
- */
-@SuppressWarnings("unused")
-public class Documentation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-    private DocumentationType type;
-    private String name;
-    private String summary;
-    private DocumentSourceType sourceType;
-    private String sourceUrl;
-    private DocumentVisibility visibility;
-    private Date lastUpdated;
-    private String filePath;
-    private Date createdDate;
-
-    public String getOtherTypeName() {
-        return otherTypeName;
-    }
-
-    public void setOtherTypeName(String otherTypeName) {
-        this.otherTypeName = otherTypeName;
-    }
-
-    private String otherTypeName;
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public String getSourceUrl() {
-        return sourceUrl;
-    }
-
-    public void setSourceUrl(String sourceUrl) {
-        this.sourceUrl = sourceUrl;
-    }
-
-    public Documentation(DocumentationType type, String name) {
-        this.type = type;
-        this.name = name;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Documentation that = (Documentation) o;
-
-        return name.equals(that.name) && type == that.type;
-
-    }
-
-    public DocumentationType getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-
-    public String getSummary() {
-        return summary;
-    }
-
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    public DocumentVisibility getVisibility() {
-        return visibility;
-    }
-
-    public void setVisibility(DocumentVisibility visibility) {
-        this.visibility = visibility;
-    }
-
-
-    public DocumentSourceType getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(DocumentSourceType sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = type.hashCode();
-        result = 31 * result + name.hashCode();
-        return result;
-    }
-
-    public Date getLastUpdated() {
-        return lastUpdated;
-    }
-
-    public void setLastUpdated(Date lastUpdated) {
-        this.lastUpdated = lastUpdated;
-    }
-
-    public enum DocumentSourceType {
-        INLINE("In line"), MARKDOWN("Markdown"), URL("URL"), FILE("File");
-
-        private String type;
-
-        private DocumentSourceType(String type) {
-            this.type = type;
-        }
-    }
-
-    public enum DocumentVisibility {
-        OWNER_ONLY("owner_only"), PRIVATE("private"), API_LEVEL("api_level");
-
-        private String visibility;
-
-        private DocumentVisibility(String visibility) {
-            this.visibility = visibility;
-        }
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/DocumentationType.java b/src/main/java/cz/trask/migration/model/v32/DocumentationType.java
deleted file mode 100644
index ee432ee..0000000
--- a/src/main/java/cz/trask/migration/model/v32/DocumentationType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-/**
- * Types of Documentation that can exist for an API.
- */
-@SuppressWarnings("unused")
-public enum DocumentationType {
-    HOWTO("How To"),
-    SAMPLES("Samples"),
-    PUBLIC_FORUM("Public Forum"),
-    SUPPORT_FORUM("Support Forum"),
-    API_MESSAGE_FORMAT("API Message Format"),
-    SWAGGER_DOC("Swagger API Definition"),
-    OTHER("Other");
-
-    private String type;
-
-    private DocumentationType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Endpoint.java b/src/main/java/cz/trask/migration/model/v32/Endpoint.java
deleted file mode 100644
index 8118e2e..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Endpoint.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-public class Endpoint {
-
-    private String id = null;
-
-    private String name = null;
-
-    private EndpointEndpointConfig endpointConfig = null;
-
-    private EndpointSecurity endpointSecurity = null;
-
-    private Long maxTps = null;
-
-    private String type = null;
-
-    public String getId() {
-
-        return id;
-    }
-
-    public void setId(String id) {
-
-        this.id = id;
-    }
-
-    public String getName() {
-
-        return name;
-    }
-
-    public void setName(String name) {
-
-        this.name = name;
-    }
-
-    public EndpointEndpointConfig getEndpointConfig() {
-
-        return endpointConfig;
-    }
-
-    public void setEndpointConfig(EndpointEndpointConfig endpointConfig) {
-
-        this.endpointConfig = endpointConfig;
-    }
-
-    public EndpointSecurity getEndpointSecurity() {
-
-        return endpointSecurity;
-    }
-
-    public void setEndpointSecurity(EndpointSecurity endpointSecurity) {
-
-        this.endpointSecurity = endpointSecurity;
-    }
-
-    public Long getMaxTps() {
-
-        return maxTps;
-    }
-
-    public void setMaxTps(Long maxTps) {
-
-        this.maxTps = maxTps;
-    }
-
-    public String getType() {
-
-        return type;
-    }
-
-    public void setType(String type) {
-
-        this.type = type;
-    }
-
-    @Override
-    public String toString() {
-
-        return "Endpoint{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", endpointConfig=" + endpointConfig +
-                ", endpointSecurity=" + endpointSecurity +
-                ", maxTps=" + maxTps +
-                ", type='" + type + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/EndpointConfig.java b/src/main/java/cz/trask/migration/model/v32/EndpointConfig.java
deleted file mode 100644
index 667800a..0000000
--- a/src/main/java/cz/trask/migration/model/v32/EndpointConfig.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EndpointConfig {
-
-
-    private String url = null;
-
-
-    private String timeout = null;
-
-
-    private Boolean isPrimary = null;
-
-
-    private List<EndpointConfigAttributes> attributes = new ArrayList<EndpointConfigAttributes>();
-
-    public String getUrl() {
-
-        return url;
-    }
-
-    public void setUrl(String url) {
-
-        this.url = url;
-    }
-
-    public String getTimeout() {
-
-        return timeout;
-    }
-
-    public void setTimeout(String timeout) {
-
-        this.timeout = timeout;
-    }
-
-    public Boolean getPrimary() {
-
-        return isPrimary;
-    }
-
-    public void setPrimary(Boolean primary) {
-
-        isPrimary = primary;
-    }
-
-    public List<EndpointConfigAttributes> getAttributes() {
-
-        return attributes;
-    }
-
-    public void setAttributes(List<EndpointConfigAttributes> attributes) {
-
-        this.attributes = attributes;
-    }
-
-    @Override
-    public String toString() {
-
-        return "EndpointConfig{" +
-                "url='" + url + '\'' +
-                ", timeout='" + timeout + '\'' +
-                ", isPrimary=" + isPrimary +
-                ", attributes=" + attributes +
-                '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/EndpointConfigAttributes.java b/src/main/java/cz/trask/migration/model/v32/EndpointConfigAttributes.java
deleted file mode 100644
index 03ae51c..0000000
--- a/src/main/java/cz/trask/migration/model/v32/EndpointConfigAttributes.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-public class EndpointConfigAttributes {
-
-    private String name = null;
-
-
-    private String value = null;
-
-    public String getName() {
-
-        return name;
-    }
-
-    public void setName(String name) {
-
-        this.name = name;
-    }
-
-    public String getValue() {
-
-        return value;
-    }
-
-    public void setValue(String value) {
-
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-
-        return "EndpointConfigAttributes{" +
-                "name='" + name + '\'' +
-                ", value='" + value + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/EndpointEndpointConfig.java b/src/main/java/cz/trask/migration/model/v32/EndpointEndpointConfig.java
deleted file mode 100644
index 14cb45d..0000000
--- a/src/main/java/cz/trask/migration/model/v32/EndpointEndpointConfig.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EndpointEndpointConfig {
-
-
-    public enum EndpointTypeEnum {
-        SINGLE,  LOAD_BALANCED,  FAIL_OVER,
-    };
-
-    private EndpointTypeEnum endpointType = null;
-
-
-    private List<EndpointConfig> list = new ArrayList<EndpointConfig>();
-
-    public EndpointTypeEnum getEndpointType() {
-
-        return endpointType;
-    }
-
-    public void setEndpointType(EndpointTypeEnum endpointType) {
-
-        this.endpointType = endpointType;
-    }
-
-    public List<EndpointConfig> getList() {
-
-        return list;
-    }
-
-    public void setList(List<EndpointConfig> list) {
-
-        this.list = list;
-    }
-
-    @Override
-    public String toString() {
-
-        return "EndpointEndpointConfig{" +
-                "endpointType=" + endpointType +
-                ", list=" + list +
-                '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/EndpointSecurity.java b/src/main/java/cz/trask/migration/model/v32/EndpointSecurity.java
deleted file mode 100644
index d58e0db..0000000
--- a/src/main/java/cz/trask/migration/model/v32/EndpointSecurity.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- *  Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package cz.trask.migration.model.v32;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class EndpointSecurity {
-
-    private String uniqueIdentifier = null;
-
-    private String password = null;
-
-    private String type = null;
-
-    private boolean enabled = false;
-
-    private String username = null;
-
-    private String grantType = null;
-
-    private String tokenUrl = null;
-
-    private String clientId = null;
-
-    private String clientSecret = null;
-
-    private String customParameters = null;
-
-    private Map additionalProperties = new HashMap();
-
-    public String getUniqueIdentifier() {
-        return uniqueIdentifier;
-    }
-
-    public void setUniqueIdentifier(String uniqueIdentifier) {
-        this.uniqueIdentifier = uniqueIdentifier;
-    }
-
-    public String getPassword() {
-
-        return password;
-    }
-
-    public void setPassword(String password) {
-
-        this.password = password;
-    }
-
-    public String getType() {
-
-        return type;
-    }
-
-    public void setType(String type) {
-
-        this.type = type;
-    }
-
-    public boolean isEnabled() {
-
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-
-        this.enabled = enabled;
-    }
-
-    public String getUsername() {
-
-        return username;
-    }
-
-    public void setUsername(String username) {
-
-        this.username = username;
-    }
-
-    public String getGrantType() {
-        return grantType;
-    }
-
-    public void setGrantType(String grantType) {
-        this.grantType = grantType;
-    }
-
-    public String getTokenUrl() {
-        return tokenUrl;
-    }
-
-    public void setTokenUrl(String tokenUrl) {
-        this.tokenUrl = tokenUrl;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-    }
-
-    public String getCustomParameters() {
-        return customParameters;
-    }
-
-    public void setCustomParameters(String customParameters) {
-        this.customParameters = customParameters;
-    }
-
-    public Map getAdditionalProperties() {
-
-        return additionalProperties;
-    }
-
-    public void setAdditionalProperties(Map additionalProperties) {
-
-        this.additionalProperties = additionalProperties;
-    }
-
-    @Override public String toString() {
-        return "EndpointSecurity{" + "uniqueIdentifier='" + uniqueIdentifier + '\'' + ", password='" + password + '\''
-                + ", type='" + type + '\'' + ", enabled=" + enabled + ", username='" + username + '\'' + ", grantType='"
-                + grantType + '\'' + ", tokenUrl='" + tokenUrl + '\'' + ", clientId='" + clientId + '\''
-                + ", clientSecret='" + clientSecret + '\'' + ", customParameters='" + customParameters + '\''
-                + ", additionalProperties=" + additionalProperties + '}';
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Identifier.java b/src/main/java/cz/trask/migration/model/v32/Identifier.java
deleted file mode 100644
index 529e541..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Identifier.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package cz.trask.migration.model.v32;
-
-/**
- * Interface for All Identifiers
- */
-public interface Identifier {
-    /**
-     * Name of provider 
-     * @return name
-     */
-    String getProviderName();
-    
-    /**
-     * Tier related to the identifier
-     * @return Tier
-     */
-    String getTier();
-    
-    /**
-     * Set tier related to the identifier
-     * @param tier
-     * @return
-     */
-    void setTier(String tier);
-    
-    /**
-     * Name of the identifier
-     * @return name
-     */
-    String getName();
-    
-    /**
-     * Version of the identifier
-     * @return version
-     */
-    String getVersion();
-    
-    /**
-     * UUID of the identifier
-     * @return uuid
-     */
-    String getUUID();
-    
-    /**
-     * Internal API Id
-     * @return id
-     */
-    int getId();
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Label.java b/src/main/java/cz/trask/migration/model/v32/Label.java
deleted file mode 100644
index 456a861..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Label.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-*  Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * This class represent the Label
- */
-public class Label {
-    private String labelId;
-    private String name;
-    private String tenantId;
-    private String description;
-    private List<String> accessUrls = new ArrayList<>();
-
-    public Label() {
-    }
-
-    public String getLabelId() {
-        return labelId;
-    }
-
-    public void setLabelId(String labelId) {
-        this.labelId = labelId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public List<String> getAccessUrls() {
-        return accessUrls;
-    }
-
-    public void setAccessUrls(List<String> accessUrls) {
-        this.accessUrls = accessUrls;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (this == obj) return true;
-        Label other = (Label) obj;
-        if (!Objects.equals(this.name, other.name)) return false;
-        if (!Objects.equals(this.labelId, other.labelId)) return false;
-        if (!Objects.equals(this.description, other.description)) return false;
-        if (!Objects.equals(this.tenantId, other.tenantId)) return false;
-        if (!Objects.equals(this.accessUrls, other.accessUrls)) return false;
-        return true;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Limit.java b/src/main/java/cz/trask/migration/model/v32/Limit.java
deleted file mode 100644
index 9aa0277..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Limit.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-*  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-public class Limit {
-
-    private String timeUnit;
-    private int unitTime;
-
-    public String getTimeUnit() {
-        return timeUnit;
-    }
-
-    public void setTimeUnit(String timeUnit) {
-        this.timeUnit = timeUnit;
-    }
-
-    public int getUnitTime() {
-        return unitTime;
-    }
-
-    public void setUnitTime(int unitTime) {
-        this.unitTime = unitTime;
-    }
-
-    @Override
-    public String toString() {
-        return "Limit [timeUnit=" + timeUnit + ", unitTime=" + unitTime + "]";
-    }
-    
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Policy.java b/src/main/java/cz/trask/migration/model/v32/Policy.java
deleted file mode 100644
index f177173..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Policy.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-*  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Policy implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private int policyId;
-    private String uuid;
-    private String policyName;
-    private String displayName;
-    private String description;
-    private QuotaPolicy defaultQuotaPolicy;
-    private int tenantId;
-    private String tenantDomain;
-    private boolean isDeployed;
-
-    public Policy(String name){
-        this.policyName = name;
-        this.policyId = -1;
-        this.tenantId = -1;
-        this.isDeployed = false;
-    }
-
-    public int getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(int tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getPolicyName() {
-        return policyName;
-    }
-
-    public void setPolicyName(String policyName) {
-        this.policyName = policyName;
-    }
-
-    public String getUUID() {
-        return uuid;
-    }
-
-    public void setUUID(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public void setDefaultQuotaPolicy(QuotaPolicy defaultQuotaPolicy) {
-        this.defaultQuotaPolicy = defaultQuotaPolicy;
-    }
-
-    public QuotaPolicy getDefaultQuotaPolicy() {
-        return defaultQuotaPolicy;
-    }
-
-    public int getPolicyId() {
-        return policyId;
-    }
-
-    public void setPolicyId(int policyId) {
-        this.policyId = policyId;
-    }
-
-    public boolean isDeployed() {
-        return isDeployed;
-    }
-
-    public void setDeployed(boolean deployed) {
-        isDeployed = deployed;
-    }
-
-
-    @Override
-    public String toString() {
-        return "Policy{" +
-                "defaultQuotaPolicy=" + defaultQuotaPolicy +
-                ", policyName='" + policyName + '\'' +
-                ", description='" + description + '\'' +
-                ", tenantId=" + tenantId +
-                '}';
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getTenantDomain() {
-        return tenantDomain;
-    }
-
-    public void setTenantDomain(String tenantDomain) {
-        this.tenantDomain = tenantDomain;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/PolicyConstants.java b/src/main/java/cz/trask/migration/model/v32/PolicyConstants.java
deleted file mode 100644
index d0bdc5f..0000000
--- a/src/main/java/cz/trask/migration/model/v32/PolicyConstants.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-*  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-public class PolicyConstants {
-
-    public static final String IP_RANGE_TYPE = "IPRange";
-
-    public static final String IP_SPECIFIC_TYPE ="IPSpecific";
-
-    public static final String HEADER_TYPE = "Header";
-
-    public static final String DATE_RANGE_TYPE = "DateRage";
-
-    public static final String DATE_SPECIFIC_TYPE = "DateSpecific";
-
-    public static final String JWT_CLAIMS_TYPE = "JWTClaims";
-
-    public static final String HTTP_VERB_TYPE = "HTTPVerb";
-
-    public static final String QUERY_PARAMETER_TYPE = "QueryParameterType";
-
-    public static final String BANDWIDTH_TYPE = "bandwidthVolume";
-
-    public static final String REQUEST_COUNT_TYPE = "requestCount";
-
-    public static final String DATE_QUERY = "date";
-
-    public static final String IP_QUERY = "ip";
-
-    public static final String IPv6_QUERY = "ipv6";
-    
-    public static final String HTTP_VERB_QUERY = "verb";
-
-    public static final String OPEN_BRACKET = "(";
-
-    public static final String CLOSE_BRACKET = ")";
-
-    public static final String INVERT_CONDITION = "NOT";
-
-    public static final String EQUAL = "==";
-
-    public static final String AND = " AND ";
-
-    public static final String GREATER_THAN = ">=";
-
-    public static final String LESS_THAN = "<=";
-    
-    public static final String QUOTE = "'";
-
-    public static final String COMMA = ",";
-
-    public static final String NULL_CHECK = "null";
-
-    public static final String START_QUERY = "cast(map:get(propertiesMap,'";
-
-    public static final String REGEX_PREFIX_QUERY = "regex:find(";
-
-    public static final String REGEX_SUFFIX_QUERY = ")";
-
-    public static final String NULL_START_QUERY = "map:get(propertiesMap,'";
-
-    public static final String END_QUERY = "'),'string')";
-
-    public static final String NULL_END_QUERY = "') is null";
-
-    public static final String END_QUERY_LONG = "'),'Long')";
-
-    public static final String END_LONG = "l";
-
-    public static final String PER_USER =  "userLevel";
-
-    public static final String ACROSS_ALL = "apiLevel";
-    
-    public static final String POLICY_LEVEL_API = "api";
-
-    public static final String POLICY_LEVEL_RESOURCE = "resource";
-
-    public static final String POLICY_LEVEL_SUB = "sub";
-    
-    public static final String POLICY_LEVEL_GLOBAL = "global";
-    
-    public static final String POLICY_LEVEL_APP = "app";
-    
-    public static final String API_THROTTLE_POLICY_TABLE = "AM_API_THROTTLE_POLICY";
-    
-    public static final String POLICY_GLOBAL_TABLE = "AM_POLICY_GLOBAL";
-    
-    public static final String POLICY_SUBSCRIPTION_TABLE = "AM_POLICY_SUBSCRIPTION";
-    
-    public static final String POLICY_APPLICATION_TABLE = "AM_POLICY_APPLICATION";
-    
-    public static final String POLICY_ID = "POLICY_ID";
-
-    public static final String POLICY_IS_DEPLOYED = "IS_DEPLOYED";
-
-    public static final String MB = "MB";
-
-    public static final String KB = "KB";
-
-    public static final String MEDIATION_NAME_ATTRIBUTE = "name";
-    
-    public static final String  THROTTLING_TIER_CONTENT_AWARE_SEPERATOR = ">";
-
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/QuotaPolicy.java b/src/main/java/cz/trask/migration/model/v32/QuotaPolicy.java
deleted file mode 100644
index bebb572..0000000
--- a/src/main/java/cz/trask/migration/model/v32/QuotaPolicy.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-*  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-package cz.trask.migration.model.v32;
-
-
-public class QuotaPolicy {
-
-    private String type;
-    private Limit limit;
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Limit getLimit() {
-        return limit;
-    }
-
-    public void setLimit(Limit limit) {
-        this.limit = limit;
-    }
-
-    @Override
-    public String toString() {
-        return "QuotaPolicy [type=" + type + ", limit=" + limit + "]";
-    }
-    
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/ResourceFile.java b/src/main/java/cz/trask/migration/model/v32/ResourceFile.java
deleted file mode 100644
index a5830a1..0000000
--- a/src/main/java/cz/trask/migration/model/v32/ResourceFile.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright WSO2 Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package cz.trask.migration.model.v32;
-
-import java.io.InputStream;
-
-public class ResourceFile {
-    
-    private InputStream content;
-    private String contentType;
-
-    public ResourceFile(InputStream content, String contentType) {
-        this.content = content;
-        this.contentType = contentType;
-    }
-
-    public InputStream getContent() {
-        return content;
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Scope.java b/src/main/java/cz/trask/migration/model/v32/Scope.java
deleted file mode 100644
index eb9ac1e..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Scope.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class Scope implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    String key;
-    String name;
-    String roles;
-    String description;
-    String id;
-    int usageCount;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRoles() {
-        return roles;
-    }
-
-    public void setRoles(String roles) {
-        this.roles = roles;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public int getUsageCount() {
-        return usageCount;
-    }
-
-    public void setUsageCount(int usageCount) {
-        this.usageCount = usageCount;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Scope scope = (Scope) o;
-
-        if (id != null ? !id.equals(scope.id) : scope.id != null) return false;
-        if (!key.equals(scope.key)) return false;
-        if (!name.equals(scope.name)) return false;
-        if (roles != null ? !roles.equals(scope.roles) : scope.roles != null) return false;
-        return description != null ? description.equals(scope.description) : scope.description == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(key, name, roles, description, id);
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/Tier.java b/src/main/java/cz/trask/migration/model/v32/Tier.java
deleted file mode 100644
index c3e5442..0000000
--- a/src/main/java/cz/trask/migration/model/v32/Tier.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * This class represent the Tier
- */
-@SuppressWarnings("unused")
-public class Tier implements Serializable, Comparable<Tier>{
-
-    private static final long serialVersionUID = 1L;
-
-    private String name;
-    private String displayName;
-    private String description;
-    private byte[] policyContent;
-    private Map<String,Object> tierAttributes;
-
-    private long requestsPerMin = 0;
-    private long requestCount = 0;
-    private long unitTime = 0;
-    private String timeUnit = "ms";
-    private String tierPlan;
-    // The default value would be "true" since the default behavior is to stop when the quota is reached
-    private boolean stopOnQuotaReached = true;
-    private TierPermission tierPermission;
-    private Map<String,String> monetizationAttributes;
-
-    public Map<String, String> getMonetizationAttributes() {
-        return monetizationAttributes;
-    }
-
-    public void setMonetizationAttributes(Map<String, String> monetizationAttributes) {
-        this.monetizationAttributes = monetizationAttributes;
-    }
-
-    public Tier(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public byte[] getPolicyContent() {
-        return policyContent;
-    }
-
-    public void setPolicyContent(byte[] policyContent) {
-        this.policyContent = policyContent;
-    }
-    public Map<String,Object> getTierAttributes() {
-        return tierAttributes;
-    }
-
-    public void setTierAttributes(Map<String,Object> tierAttributes) {
-        this.tierAttributes = tierAttributes;
-    }
-
-    public long getRequestsPerMin() {
-        return requestsPerMin;
-    }
-
-    public void setRequestsPerMin(long requestsPerMin) {
-        this.requestsPerMin = requestsPerMin;
-    }
-
-    public long getRequestCount() {
-        return requestCount;
-    }
-
-    public void setRequestCount(long requestCount) {
-        this.requestCount = requestCount;
-    }
-
-    public long getUnitTime() {
-        return unitTime;
-    }
-
-    public void setUnitTime(long unitTime) {
-        this.unitTime = unitTime;
-    }
-
-    public String getTimeUnit() {
-        return timeUnit;
-    }
-
-    public void setTimeUnit(String timeUnit) {
-        this.timeUnit = timeUnit;
-    }
-
-    public String getTierPlan() {
-        return tierPlan;
-    }
-
-    public void setTierPlan(String tierPlan) {
-        this.tierPlan = tierPlan;
-    }
-
-    public boolean isStopOnQuotaReached() {
-        return stopOnQuotaReached;
-    }
-
-    public void setStopOnQuotaReached(boolean stopOnQuotaReached) {
-        this.stopOnQuotaReached = stopOnQuotaReached;
-    }
-
-    public TierPermission getTierPermission() {
-        return tierPermission;
-    }
-
-    public void setTierPermission(TierPermission tierPermission) {
-        this.tierPermission = tierPermission;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Tier tier = (Tier) o;
-
-        return !(name != null ? !name.equals(tier.name) : tier.name != null);
-
-    }
-
-    @Override
-    public int hashCode() {
-        return name != null ? name.hashCode() : 0;
-    }
-
-    @Override
-    public int compareTo(Tier tier) {
-        if(tier.getRequestsPerMin() == Long.MAX_VALUE || tier.getRequestsPerMin() == Integer.MAX_VALUE){
-            return 1;
-        }
-        else if(this.getRequestsPerMin() == Long.MAX_VALUE || this.getRequestsPerMin() == Integer.MAX_VALUE){
-            return -1;
-        }
-        return new Long(tier.getRequestsPerMin() - this.getRequestsPerMin()).intValue();
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/TierPermission.java b/src/main/java/cz/trask/migration/model/v32/TierPermission.java
deleted file mode 100644
index a9bebf5..0000000
--- a/src/main/java/cz/trask/migration/model/v32/TierPermission.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package cz.trask.migration.model.v32;
-
-/**
- * This class represents Tier Permissions
- */
-public class TierPermission {
-
-    private String tierName;
-    private String permissionType;
-    private String[] roles;
-
-    public TierPermission(String name) {
-        this.tierName = name;
-    }
-
-    public String getTierName() {
-        return tierName;
-    }
-
-    public void setTierName(String tierName) {
-        this.tierName = tierName;
-    }
-
-    public String getPermissionType() {
-        return permissionType;
-    }
-
-    public void setPermissionType(String permissionType) {
-        this.permissionType = permissionType;
-    }
-
-    public String[] getRoles() {
-        return roles;
-    }
-
-    public void setRoles(String[] roles) {
-        this.roles = roles;
-    }
-}
diff --git a/src/main/java/cz/trask/migration/model/v32/URITemplate.java b/src/main/java/cz/trask/migration/model/v32/URITemplate.java
deleted file mode 100644
index 43edf98..0000000
--- a/src/main/java/cz/trask/migration/model/v32/URITemplate.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-*  Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. licenses this file to you under the Apache License,
-*  Version 2.0 (the "License"); you may not use this file except
-*  in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package cz.trask.migration.model.v32;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.json.simple.JSONValue;
-
-public class URITemplate implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    private String uriTemplate;
-    private String resourceURI;
-    private String resourceSandboxURI;
-    private String httpVerb;
-    private String authType;
-    private LinkedHashSet<String> httpVerbs = new LinkedHashSet<String>();
-    private List<String> authTypes = new ArrayList<String>();
-    private List<String> throttlingConditions = new ArrayList<String>();
-    private String applicableLevel;
-    private String throttlingTier;
-    private List<String> throttlingTiers = new ArrayList<String>();
-    private Scope scope;
-    private String mediationScript;
-    private List<Scope> scopes = new ArrayList<Scope>();
-    private Map<String, String> mediationScripts = new HashMap<String, String>();
-    private ConditionGroupDTO[] conditionGroups;
-    private int id;
-    private Set<APIProductIdentifier> usedByProducts = new HashSet<>();
-    private String amznResourceName;
-    private int amznResourceTimeout;
-
-    public ConditionGroupDTO[] getConditionGroups() {
-        return conditionGroups;
-    }
-
-    public void setConditionGroups(ConditionGroupDTO[] conditionGroups) {
-        this.conditionGroups = conditionGroups;
-    }
-
-    public String getMediationScript() {
-        return mediationScript;
-    }
-
-
-    public List<String> getThrottlingConditions() {
-        return throttlingConditions;
-    }
-
-    public void setThrottlingConditions(List<String> throttlingConditions) {
-        this.throttlingConditions = throttlingConditions;
-    }
-
-    public void setMediationScript(String mediationScript) {
-        this.mediationScript = mediationScript;
-    }
-	/**
-     * Set mediation script for a given http method
-     * @param method http method name
-     * @param mediationScript mediation script content
-     */
-    public void setMediationScripts(String method, String mediationScript){
-        if (mediationScript != null  && !mediationScript.trim().equals("") && !mediationScript.trim().equals("null")){
-            mediationScripts.put(method, mediationScript);
-        }
-
-    }
-
-    /**
-     * Generating the script by aggregating scripts of each http method to form a single script in to be
-     * used when generating synapse configuration file.
-     *
-     * @return aggregated script in the following format,
-     * if (http-method = 'GET'){
-     *     //script for GET
-     * }
-     * ....
-     * ....
-     * if (http-method = 'POST'){
-     *     //script for POST
-     * }
-     */
-    public String getAggregatedMediationScript(){
-        if (mediationScripts.isEmpty()){
-            return "null";
-        }else if (mediationScripts.size() == 1 && httpVerbs.size() == 1){
-            return mediationScript;
-        }else{
-            StringBuilder aggregatedScript = new StringBuilder();
-
-            for (Map.Entry<String, String> entry : mediationScripts.entrySet()){
-                String httpMethod = entry.getKey();
-                String mediationScript = entry.getValue();
-
-                aggregatedScript.append("if (mc.getProperty('REST_METHOD') == '").append(httpMethod).append("'){");
-                aggregatedScript.append(mediationScript);
-                aggregatedScript.append("}");
-
-            }
-
-            return aggregatedScript.toString();
-        }
-    }
-
-    public String getThrottlingTier() {
-        return throttlingTier;
-    }
-
-    public void setThrottlingTier(String throttlingTier) {
-        this.throttlingTier = throttlingTier;
-    }
-
-    public List<String> getThrottlingTiers(){
-        return throttlingTiers;
-    }
-
-    public void setThrottlingTiers(List<String> throttlingTiers) {
-        this.throttlingTiers = throttlingTiers;
-    }
-
-    public String getHTTPVerb() {
-        return httpVerb;
-    }
-
-    public void setHTTPVerb(String httpVerb) {
-        this.httpVerb = httpVerb;
-    }
-
-    public String getAuthType() {
-        return authType;
-    }
-
-    public void setAuthType(String authType) {
-        this.authType = authType;
-
-    }
-
-    public String getResourceURI() {
-        return resourceURI;
-    }
-
-    public void setResourceURI(String resourceURI) {
-        this.resourceURI = resourceURI;
-    }
-
-    public boolean isResourceURIExist(){
-        return this.resourceURI != null;
-    }
-
-    public String getResourceSandboxURI() {
-        return resourceSandboxURI;
-    }
-
-    public void setResourceSandboxURI(String resourceSandboxURI) {
-        this.resourceSandboxURI = resourceSandboxURI;
-    }
-
-    public boolean isResourceSandboxURIExist(){
-        return this.resourceSandboxURI != null;
-    }
-
-    public String getUriTemplate() {
-        return uriTemplate;
-    }
-
-    public void setUriTemplate(String template) {
-        this.uriTemplate = template;
-    }
-
-    public void setHttpVerbs(String httpVerb) {
-
-        httpVerbs.add(httpVerb);
-    }
-
-    public String getHttpVerbs() {
-
-        return httpVerb;
-    }
-
-    public void setAuthTypes(String authType) {
-
-        authTypes.add(authType);
-    }
-
-    public String getAuthTypes() {
-
-        return authType;
-    }
-
-
-    public String getMethodsAsString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String method : httpVerbs) {
-            stringBuilder.append(method).append(" ");
-        }
-        return stringBuilder.toString().trim();
-    }
-
-    public String getAuthTypeAsString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String authType : authTypes) {
-            stringBuilder.append(authType).append(" ");
-        }
-        return stringBuilder.toString().trim();
-    }
-
-    public String getThrottlingConditionsAsString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String authType : throttlingConditions) {
-            stringBuilder.append(authType).append(" ");
-        }
-        return stringBuilder.toString().trim();
-    }
-
-    public void setThrottlingTiers(String tier) {
-        throttlingTiers.add(tier);
-    }
-
-    public String getThrottlingTiersAsString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String tier : throttlingTiers) {
-            if (tier.contains(PolicyConstants.THROTTLING_TIER_CONTENT_AWARE_SEPERATOR)) {
-                stringBuilder.append(tier.substring(0,
-                        tier.indexOf(PolicyConstants.THROTTLING_TIER_CONTENT_AWARE_SEPERATOR)).trim()).append(" ");
-            } else {
-                stringBuilder.append(tier.trim()).append(" ");
-            }
-        }
-        return stringBuilder.toString().trim();
-    }
-    
-    public boolean checkContentAwareFromThrottlingTiers() {
-        // use the content aware property appended  to throttling tiers
-        if (!throttlingTiers.isEmpty()) {
-            String throttlingTierWithContentAware = throttlingTiers.get(0);
-            if (throttlingTierWithContentAware != null &&
-                    throttlingTierWithContentAware.contains(PolicyConstants.THROTTLING_TIER_CONTENT_AWARE_SEPERATOR)) {
-                String[] splitThrottlingTiers =
-                        throttlingTierWithContentAware.split(PolicyConstants.THROTTLING_TIER_CONTENT_AWARE_SEPERATOR);
-                return Boolean.valueOf(splitThrottlingTiers[splitThrottlingTiers.length - 1]);
-            }
-        }
-        return false;
-    }
-
-    public Scope getScope() {
-        return scope;
-    }
-    public Scope getScopes() {
-        return scope;
-    }
-
-    public void setScope(Scope scope) {
-        this.scope = scope;
-    }
-
-    public void setScopes(Scope scope){
-        this.scopes.add(scope);
-    }
-
-    public String getResourceMap(){
-        Map verbs = new LinkedHashMap();
-        int i = 0;
-        for (String method : httpVerbs) {
-            Map verb = new LinkedHashMap();
-            verb.put("auth_type",authTypes.get(i));
-            verb.put("throttling_tier",throttlingTiers.get(i));
-            //Following parameter is not required as it not need to reflect UI level. If need please enable it.
-            // /verb.put("throttling_conditions", throttlingConditions.get(i));
-            try{
-                Scope tmpScope = scopes.get(i);
-                if(tmpScope != null){
-                    verb.put("scope",tmpScope.getKey());
-                }
-            }catch(IndexOutOfBoundsException e){
-                //todo need to rewrite to prevent this type of exceptions
-            }
-            verbs.put(method,verb);
-            i++;
-        }
-        //todo this is a hack to make key validation service stub from braking need to rewrite.
-        return JSONValue.toJSONString(verbs);
-    }
-
-    public String getApplicableLevel() {
-        return applicableLevel;
-    }
-
-    public void setApplicableLevel(String applicableLevel) {
-        this.applicableLevel = applicableLevel;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        URITemplate that = (URITemplate) o;
-
-        if (!uriTemplate.equals(that.uriTemplate)) {
-            return false;
-        }
-        if (resourceURI != null ? !resourceURI.equals(that.resourceURI) : that.resourceURI != null) {
-            return false;
-        }
-        if (resourceSandboxURI != null ? !resourceSandboxURI.equals(that.resourceSandboxURI) : that
-                .resourceSandboxURI != null) {
-            return false;
-        }
-        if (!httpVerb.equals(that.httpVerb)) {
-            return false;
-        }
-        if (!authType.equals(that.authType)) {
-            return false;
-        }
-        if (!httpVerbs.equals(that.httpVerbs)) {
-            return false;
-        }
-        if (!authTypes.equals(that.authTypes)) {
-            return false;
-        }
-        if (throttlingConditions != null ? !throttlingConditions.equals(that.throttlingConditions) : that
-                .throttlingConditions != null) {
-            return false;
-        }
-        if (applicableLevel != null ? !applicableLevel.equals(that.applicableLevel) : that.applicableLevel != null) {
-            return false;
-        }
-        if (!throttlingTier.equals(that.throttlingTier)) {
-            return false;
-        }
-        if (!throttlingTiers.equals(that.throttlingTiers)) {
-            return false;
-        }
-        if (scope != null ? !scope.equals(that.scope) : that.scope != null) {
-            return false;
-        }
-        if (mediationScript != null ? !mediationScript.equals(that.mediationScript) : that.mediationScript != null) {
-            return false;
-        }
-        if (scopes != null ? !scopes.equals(that.scopes) : that.scopes != null) {
-            return false;
-        }
-        if (mediationScripts != null ? !mediationScripts.equals(that.mediationScripts) : that.mediationScripts !=
-                null) {
-            return false;
-        }
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        return Arrays.equals(conditionGroups, that.conditionGroups);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = uriTemplate.hashCode();
-        result = 31 * result + (resourceURI != null ? resourceURI.hashCode() : 0);
-        result = 31 * result + (resourceSandboxURI != null ? resourceSandboxURI.hashCode() : 0);
-        result = 31 * result + (httpVerb != null ? httpVerb.hashCode() : 0);
-        result = 31 * result + (authType != null ? authType.hashCode() : 0);
-        result = 31 * result + (httpVerbs != null ? httpVerbs.hashCode() : 0);
-        result = 31 * result + (authTypes != null ? authTypes.hashCode() : 0);
-        result = 31 * result + (throttlingConditions != null ? throttlingConditions.hashCode() : 0);
-        result = 31 * result + (applicableLevel != null ? applicableLevel.hashCode() : 0);
-        result = 31 * result + (throttlingTier != null ? throttlingTier.hashCode() : 0);
-        result = 31 * result + (throttlingTiers != null ? throttlingTiers.hashCode() : 0);
-        result = 31 * result + (scope != null ? scope.hashCode() : 0);
-        result = 31 * result + (mediationScript != null ? mediationScript.hashCode() : 0);
-        result = 31 * result + (scopes != null ? scopes.hashCode() : 0);
-        result = 31 * result + (mediationScripts != null ? mediationScripts.hashCode() : 0);
-        result = 31 * result + Arrays.hashCode(conditionGroups);
-        return result;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public List<Scope> retrieveAllScopes() {
-        return this.scopes;
-    }
-
-    public void addAllScopes(List<Scope> scopes) {
-
-        this.scopes = scopes;
-    }
-
-    public Set<APIProductIdentifier> retrieveUsedByProducts() {
-        return usedByProducts;
-    }
-
-    public void addUsedByProduct(APIProductIdentifier usedByProduct) {
-        usedByProducts.add(usedByProduct);
-    }
-
-    public void setAmznResourceName(String amznResourceName) {
-        this.amznResourceName = amznResourceName;
-    }
-
-    public String getAmznResourceName() {
-        return amznResourceName;
-    }
-
-    public void setAmznResourceTimeout(int amznResourceTimeout) {
-        this.amznResourceTimeout = amznResourceTimeout;
-    }
-
-    public int getAmznResourceTimeout() {
-        return amznResourceTimeout;
-    }
-}