diff --git a/bin/main/klib/trackr/End.class b/bin/main/klib/trackr/End.class
deleted file mode 100644
index bed7126..0000000
Binary files a/bin/main/klib/trackr/End.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Leg.class b/bin/main/klib/trackr/Leg.class
index 8095e77..de98a3f 100644
Binary files a/bin/main/klib/trackr/Leg.class and b/bin/main/klib/trackr/Leg.class differ
diff --git a/bin/main/klib/trackr/MappedPosition.class b/bin/main/klib/trackr/MappedPosition.class
deleted file mode 100644
index 4ba36ea..0000000
Binary files a/bin/main/klib/trackr/MappedPosition.class and /dev/null differ
diff --git a/bin/main/klib/trackr/MappedPosition_.class b/bin/main/klib/trackr/MappedPosition_.class
deleted file mode 100644
index ea64678..0000000
Binary files a/bin/main/klib/trackr/MappedPosition_.class and /dev/null differ
diff --git a/bin/main/klib/trackr/MappedPosition__.class b/bin/main/klib/trackr/MappedPosition__.class
deleted file mode 100644
index b4c94b0..0000000
Binary files a/bin/main/klib/trackr/MappedPosition__.class and /dev/null differ
diff --git a/bin/main/klib/trackr/MetaInfo.class b/bin/main/klib/trackr/MetaInfo.class
deleted file mode 100644
index 5be5dd6..0000000
Binary files a/bin/main/klib/trackr/MetaInfo.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Mode.class b/bin/main/klib/trackr/Mode.class
deleted file mode 100644
index b1cae3e..0000000
Binary files a/bin/main/klib/trackr/Mode.class and /dev/null differ
diff --git a/bin/main/klib/trackr/OriginalPosition_.class b/bin/main/klib/trackr/OriginalPosition_.class
deleted file mode 100644
index 2eeb1c3..0000000
Binary files a/bin/main/klib/trackr/OriginalPosition_.class and /dev/null differ
diff --git a/bin/main/klib/trackr/OriginalPosition__.class b/bin/main/klib/trackr/OriginalPosition__.class
deleted file mode 100644
index 9cf275e..0000000
Binary files a/bin/main/klib/trackr/OriginalPosition__.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Response_.class b/bin/main/klib/trackr/Response_.class
index 50650ac..0a27d9c 100644
Binary files a/bin/main/klib/trackr/Response_.class and b/bin/main/klib/trackr/Response_.class differ
diff --git a/bin/main/klib/trackr/Route.class b/bin/main/klib/trackr/Route.class
index c6f52e3..4a43766 100644
Binary files a/bin/main/klib/trackr/Route.class and b/bin/main/klib/trackr/Route.class differ
diff --git a/bin/main/klib/trackr/Start.class b/bin/main/klib/trackr/Start.class
deleted file mode 100644
index fcdec9a..0000000
Binary files a/bin/main/klib/trackr/Start.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Summary.class b/bin/main/klib/trackr/Summary.class
deleted file mode 100644
index f76a109..0000000
Binary files a/bin/main/klib/trackr/Summary.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Waypoint.class b/bin/main/klib/trackr/Waypoint.class
deleted file mode 100644
index 72d698c..0000000
Binary files a/bin/main/klib/trackr/Waypoint.class and /dev/null differ
diff --git a/bin/main/klib/trackr/Waypoints.class b/bin/main/klib/trackr/Waypoints.class
deleted file mode 100644
index b01cb59..0000000
Binary files a/bin/main/klib/trackr/Waypoints.class and /dev/null differ
diff --git a/src/main/java/klib/trackr/End.java b/src/main/java/klib/trackr/End.java
deleted file mode 100644
index a20f230..0000000
--- a/src/main/java/klib/trackr/End.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "linkId", "mappedPosition", "originalPosition", "type", "spot", "sideOfStreet", "mappedRoadName",
-		"label", "shapeIndex" })
-public class End {
-
-	@JsonProperty("linkId")
-	private String linkId;
-	@JsonProperty("mappedPosition")
-	private MappedPosition__ mappedPosition;
-	@JsonProperty("originalPosition")
-	private OriginalPosition__ originalPosition;
-	@JsonProperty("type")
-	private String type;
-	@JsonProperty("spot")
-	private Integer spot;
-	@JsonProperty("sideOfStreet")
-	private String sideOfStreet;
-	@JsonProperty("mappedRoadName")
-	private String mappedRoadName;
-	@JsonProperty("label")
-	private String label;
-	@JsonProperty("shapeIndex")
-	private Integer shapeIndex;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("linkId")
-	public String getLinkId() {
-		return linkId;
-	}
-
-	@JsonProperty("linkId")
-	public void setLinkId(String linkId) {
-		this.linkId = linkId;
-	}
-
-	@JsonProperty("mappedPosition")
-	public MappedPosition__ getMappedPosition() {
-		return mappedPosition;
-	}
-
-	@JsonProperty("mappedPosition")
-	public void setMappedPosition(MappedPosition__ mappedPosition) {
-		this.mappedPosition = mappedPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public OriginalPosition__ getOriginalPosition() {
-		return originalPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public void setOriginalPosition(OriginalPosition__ originalPosition) {
-		this.originalPosition = originalPosition;
-	}
-
-	@JsonProperty("type")
-	public String getType() {
-		return type;
-	}
-
-	@JsonProperty("type")
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@JsonProperty("spot")
-	public Integer getSpot() {
-		return spot;
-	}
-
-	@JsonProperty("spot")
-	public void setSpot(Integer spot) {
-		this.spot = spot;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public String getSideOfStreet() {
-		return sideOfStreet;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public void setSideOfStreet(String sideOfStreet) {
-		this.sideOfStreet = sideOfStreet;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public String getMappedRoadName() {
-		return mappedRoadName;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public void setMappedRoadName(String mappedRoadName) {
-		this.mappedRoadName = mappedRoadName;
-	}
-
-	@JsonProperty("label")
-	public String getLabel() {
-		return label;
-	}
-
-	@JsonProperty("label")
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	@JsonProperty("shapeIndex")
-	public Integer getShapeIndex() {
-		return shapeIndex;
-	}
-
-	@JsonProperty("shapeIndex")
-	public void setShapeIndex(Integer shapeIndex) {
-		this.shapeIndex = shapeIndex;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/Leg.java b/src/main/java/klib/trackr/Leg.java
index 32c7d19..7c0313d 100644
--- a/src/main/java/klib/trackr/Leg.java
+++ b/src/main/java/klib/trackr/Leg.java
@@ -15,10 +15,6 @@
 @JsonPropertyOrder({ "start", "end", "length", "travelTime", "maneuver" })
 public class Leg {
 
-	@JsonProperty("start")
-	private Start start;
-	@JsonProperty("end")
-	private End end;
 	@JsonProperty("length")
 	private Integer length;
 	@JsonProperty("travelTime")
@@ -28,25 +24,6 @@ public class Leg {
 	@JsonIgnore
 	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
-	@JsonProperty("start")
-	public Start getStart() {
-		return start;
-	}
-
-	@JsonProperty("start")
-	public void setStart(Start start) {
-		this.start = start;
-	}
-
-	@JsonProperty("end")
-	public End getEnd() {
-		return end;
-	}
-
-	@JsonProperty("end")
-	public void setEnd(End end) {
-		this.end = end;
-	}
 
 	@JsonProperty("length")
 	public Integer getLength() {
diff --git a/src/main/java/klib/trackr/MappedPosition.java b/src/main/java/klib/trackr/MappedPosition.java
deleted file mode 100644
index dd5024a..0000000
--- a/src/main/java/klib/trackr/MappedPosition.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class MappedPosition {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-	@Override
-	public String toString() {
-		return "Latitude:" + latitude + " ;Longitude:" + longitude;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/MappedPosition_.java b/src/main/java/klib/trackr/MappedPosition_.java
deleted file mode 100644
index 03b43c3..0000000
--- a/src/main/java/klib/trackr/MappedPosition_.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class MappedPosition_ {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/MappedPosition__.java b/src/main/java/klib/trackr/MappedPosition__.java
deleted file mode 100644
index 4a3951d..0000000
--- a/src/main/java/klib/trackr/MappedPosition__.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class MappedPosition__ {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/MetaInfo.java b/src/main/java/klib/trackr/MetaInfo.java
deleted file mode 100644
index 25fba8b..0000000
--- a/src/main/java/klib/trackr/MetaInfo.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "timestamp", "mapVersion", "moduleVersion", "interfaceVersion", "availableMapVersion" })
-public class MetaInfo {
-
-	@JsonProperty("timestamp")
-	private String timestamp;
-	@JsonProperty("mapVersion")
-	private String mapVersion;
-	@JsonProperty("moduleVersion")
-	private String moduleVersion;
-	@JsonProperty("interfaceVersion")
-	private String interfaceVersion;
-	@JsonProperty("availableMapVersion")
-	private List<String> availableMapVersion = null;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("timestamp")
-	public String getTimestamp() {
-		return timestamp;
-	}
-
-	@JsonProperty("timestamp")
-	public void setTimestamp(String timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	@JsonProperty("mapVersion")
-	public String getMapVersion() {
-		return mapVersion;
-	}
-
-	@JsonProperty("mapVersion")
-	public void setMapVersion(String mapVersion) {
-		this.mapVersion = mapVersion;
-	}
-
-	@JsonProperty("moduleVersion")
-	public String getModuleVersion() {
-		return moduleVersion;
-	}
-
-	@JsonProperty("moduleVersion")
-	public void setModuleVersion(String moduleVersion) {
-		this.moduleVersion = moduleVersion;
-	}
-
-	@JsonProperty("interfaceVersion")
-	public String getInterfaceVersion() {
-		return interfaceVersion;
-	}
-
-	@JsonProperty("interfaceVersion")
-	public void setInterfaceVersion(String interfaceVersion) {
-		this.interfaceVersion = interfaceVersion;
-	}
-
-	@JsonProperty("availableMapVersion")
-	public List<String> getAvailableMapVersion() {
-		return availableMapVersion;
-	}
-
-	@JsonProperty("availableMapVersion")
-	public void setAvailableMapVersion(List<String> availableMapVersion) {
-		this.availableMapVersion = availableMapVersion;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/Mode.java b/src/main/java/klib/trackr/Mode.java
deleted file mode 100644
index 5dfb893..0000000
--- a/src/main/java/klib/trackr/Mode.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "type", "transportModes", "trafficMode", "feature" })
-public class Mode {
-
-	@JsonProperty("type")
-	private String type;
-	@JsonProperty("transportModes")
-	private List<String> transportModes = null;
-	@JsonProperty("trafficMode")
-	private String trafficMode;
-	@JsonProperty("feature")
-	private List<Object> feature = null;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("type")
-	public String getType() {
-		return type;
-	}
-
-	@JsonProperty("type")
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@JsonProperty("transportModes")
-	public List<String> getTransportModes() {
-		return transportModes;
-	}
-
-	@JsonProperty("transportModes")
-	public void setTransportModes(List<String> transportModes) {
-		this.transportModes = transportModes;
-	}
-
-	@JsonProperty("trafficMode")
-	public String getTrafficMode() {
-		return trafficMode;
-	}
-
-	@JsonProperty("trafficMode")
-	public void setTrafficMode(String trafficMode) {
-		this.trafficMode = trafficMode;
-	}
-
-	@JsonProperty("feature")
-	public List<Object> getFeature() {
-		return feature;
-	}
-
-	@JsonProperty("feature")
-	public void setFeature(List<Object> feature) {
-		this.feature = feature;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-	@Override
-	public String toString() {
-		return " " + type;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/OriginalPosition_.java b/src/main/java/klib/trackr/OriginalPosition_.java
deleted file mode 100644
index 7151bbb..0000000
--- a/src/main/java/klib/trackr/OriginalPosition_.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class OriginalPosition_ {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
diff --git a/src/main/java/klib/trackr/OriginalPosition__.java b/src/main/java/klib/trackr/OriginalPosition__.java
deleted file mode 100644
index 767bda7..0000000
--- a/src/main/java/klib/trackr/OriginalPosition__.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class OriginalPosition__ {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
diff --git a/src/main/java/klib/trackr/Response_.java b/src/main/java/klib/trackr/Response_.java
index c677d92..357ba8b 100644
--- a/src/main/java/klib/trackr/Response_.java
+++ b/src/main/java/klib/trackr/Response_.java
@@ -15,8 +15,6 @@
 @JsonPropertyOrder({ "metaInfo", "route", "language" })
 public class Response_ {
 
-	@JsonProperty("metaInfo")
-	private MetaInfo metaInfo;
 	@JsonProperty("route")
 	private List<Route> route = null;
 	@JsonProperty("language")
@@ -24,16 +22,6 @@ public class Response_ {
 	@JsonIgnore
 	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
-	@JsonProperty("metaInfo")
-	public MetaInfo getMetaInfo() {
-		return metaInfo;
-	}
-
-	@JsonProperty("metaInfo")
-	public void setMetaInfo(MetaInfo metaInfo) {
-		this.metaInfo = metaInfo;
-	}
-
 	@JsonProperty("route")
 	public List<Route> getRoute() {
 		return route;
diff --git a/src/main/java/klib/trackr/Route.java b/src/main/java/klib/trackr/Route.java
index 9e00d7f..999846c 100644
--- a/src/main/java/klib/trackr/Route.java
+++ b/src/main/java/klib/trackr/Route.java
@@ -15,36 +15,11 @@
 @JsonPropertyOrder({ "waypoint", "mode", "leg", "summary" })
 public class Route {
 
-	@JsonProperty("waypoint")
-	private List<Waypoints> waypoint = null;
-	@JsonProperty("mode")
-	private Mode mode;
 	@JsonProperty("leg")
 	private List<Leg> leg = null;
-	@JsonProperty("summary")
-	private Summary summary;
 	@JsonIgnore
 	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
-	@JsonProperty("waypoint")
-	public List<Waypoints> getWaypoint() {
-		return waypoint;
-	}
-
-	@JsonProperty("waypoint")
-	public void setWaypoint(List<Waypoints> waypoint) {
-		this.waypoint = waypoint;
-	}
-
-	@JsonProperty("mode")
-	public Mode getMode() {
-		return mode;
-	}
-
-	@JsonProperty("mode")
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
 
 	@JsonProperty("leg")
 	public List<Leg> getLeg() {
@@ -56,16 +31,6 @@ public void setLeg(List<Leg> leg) {
 		this.leg = leg;
 	}
 
-	@JsonProperty("summary")
-	public Summary getSummary() {
-		return summary;
-	}
-
-	@JsonProperty("summary")
-	public void setSummary(Summary summary) {
-		this.summary = summary;
-	}
-
 	@JsonAnyGetter
 	public Map<String, Object> getAdditionalProperties() {
 		return this.additionalProperties;
diff --git a/src/main/java/klib/trackr/Start.java b/src/main/java/klib/trackr/Start.java
deleted file mode 100644
index 17b3df8..0000000
--- a/src/main/java/klib/trackr/Start.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "linkId", "mappedPosition", "originalPosition", "type", "spot", "sideOfStreet", "mappedRoadName",
-		"label", "shapeIndex" })
-public class Start {
-
-	@JsonProperty("linkId")
-	private String linkId;
-	@JsonProperty("mappedPosition")
-	private MappedPosition_ mappedPosition;
-	@JsonProperty("originalPosition")
-	private OriginalPosition_ originalPosition;
-	@JsonProperty("type")
-	private String type;
-	@JsonProperty("spot")
-	private Double spot;
-	@JsonProperty("sideOfStreet")
-	private String sideOfStreet;
-	@JsonProperty("mappedRoadName")
-	private String mappedRoadName;
-	@JsonProperty("label")
-	private String label;
-	@JsonProperty("shapeIndex")
-	private Integer shapeIndex;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("linkId")
-	public String getLinkId() {
-		return linkId;
-	}
-
-	@JsonProperty("linkId")
-	public void setLinkId(String linkId) {
-		this.linkId = linkId;
-	}
-
-	@JsonProperty("mappedPosition")
-	public MappedPosition_ getMappedPosition() {
-		return mappedPosition;
-	}
-
-	@JsonProperty("mappedPosition")
-	public void setMappedPosition(MappedPosition_ mappedPosition) {
-		this.mappedPosition = mappedPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public OriginalPosition_ getOriginalPosition() {
-		return originalPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public void setOriginalPosition(OriginalPosition_ originalPosition) {
-		this.originalPosition = originalPosition;
-	}
-
-	@JsonProperty("type")
-	public String getType() {
-		return type;
-	}
-
-	@JsonProperty("type")
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@JsonProperty("spot")
-	public Double getSpot() {
-		return spot;
-	}
-
-	@JsonProperty("spot")
-	public void setSpot(Double spot) {
-		this.spot = spot;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public String getSideOfStreet() {
-		return sideOfStreet;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public void setSideOfStreet(String sideOfStreet) {
-		this.sideOfStreet = sideOfStreet;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public String getMappedRoadName() {
-		return mappedRoadName;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public void setMappedRoadName(String mappedRoadName) {
-		this.mappedRoadName = mappedRoadName;
-	}
-
-	@JsonProperty("label")
-	public String getLabel() {
-		return label;
-	}
-
-	@JsonProperty("label")
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	@JsonProperty("shapeIndex")
-	public Integer getShapeIndex() {
-		return shapeIndex;
-	}
-
-	@JsonProperty("shapeIndex")
-	public void setShapeIndex(Integer shapeIndex) {
-		this.shapeIndex = shapeIndex;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
diff --git a/src/main/java/klib/trackr/Summary.java b/src/main/java/klib/trackr/Summary.java
deleted file mode 100644
index 1d8c89c..0000000
--- a/src/main/java/klib/trackr/Summary.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "distance", "trafficTime", "baseTime", "flags", "text", "travelTime", "_type" })
-public class Summary {
-
-	@JsonProperty("distance")
-	private Integer distance;
-	@JsonProperty("trafficTime")
-	private Integer trafficTime;
-	@JsonProperty("baseTime")
-	private Integer baseTime;
-	@JsonProperty("flags")
-	private List<String> flags = null;
-	@JsonProperty("text")
-	private String text;
-	@JsonProperty("travelTime")
-	private Integer travelTime;
-	@JsonProperty("_type")
-	private String type;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("distance")
-	public Integer getDistance() {
-		return distance;
-	}
-
-	@JsonProperty("distance")
-	public void setDistance(Integer distance) {
-		this.distance = distance;
-	}
-
-	@JsonProperty("trafficTime")
-	public Integer getTrafficTime() {
-		return trafficTime;
-	}
-
-	@JsonProperty("trafficTime")
-	public void setTrafficTime(Integer trafficTime) {
-		this.trafficTime = trafficTime;
-	}
-
-	@JsonProperty("baseTime")
-	public Integer getBaseTime() {
-		return baseTime;
-	}
-
-	@JsonProperty("baseTime")
-	public void setBaseTime(Integer baseTime) {
-		this.baseTime = baseTime;
-	}
-
-	@JsonProperty("flags")
-	public List<String> getFlags() {
-		return flags;
-	}
-
-	@JsonProperty("flags")
-	public void setFlags(List<String> flags) {
-		this.flags = flags;
-	}
-
-	@JsonProperty("text")
-	public String getText() {
-		return text;
-	}
-
-	@JsonProperty("text")
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	@JsonProperty("travelTime")
-	public Integer getTravelTime() {
-		return travelTime;
-	}
-
-	@JsonProperty("travelTime")
-	public void setTravelTime(Integer travelTime) {
-		this.travelTime = travelTime;
-	}
-
-	@JsonProperty("_type")
-	public String getType() {
-		return type;
-	}
-
-	@JsonProperty("_type")
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-}
diff --git a/src/main/java/klib/trackr/Waypoint.java b/src/main/java/klib/trackr/Waypoint.java
deleted file mode 100644
index 4cbdb2f..0000000
--- a/src/main/java/klib/trackr/Waypoint.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "latitude", "longitude" })
-public class Waypoint {
-
-	@JsonProperty("latitude")
-	private Double latitude;
-	@JsonProperty("longitude")
-	private Double longitude;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("latitude")
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	@JsonProperty("latitude")
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	@JsonProperty("longitude")
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	@JsonProperty("longitude")
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-	@Override
-	public String toString() {
-		return "Latitude:" + latitude + " ;Longitude:" + longitude;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/klib/trackr/Waypoints.java b/src/main/java/klib/trackr/Waypoints.java
deleted file mode 100644
index adcce1f..0000000
--- a/src/main/java/klib/trackr/Waypoints.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package klib.trackr;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "linkId", "mappedPosition", "originalPosition", "type", "spot", "sideOfStreet", "mappedRoadName",
-		"label", "shapeIndex" })
-public class Waypoints {
-
-	@JsonProperty("linkId")
-	private String linkId;
-	@JsonProperty("mappedPosition")
-	private MappedPosition mappedPosition;
-	@JsonProperty("originalPosition")
-	private Waypoint originalPosition;
-	@JsonProperty("type")
-	private String type;
-	@JsonProperty("spot")
-	private Integer spot;
-	@JsonProperty("sideOfStreet")
-	private String sideOfStreet;
-	@JsonProperty("mappedRoadName")
-	private String mappedRoadName;
-	@JsonProperty("label")
-	private String label;
-	@JsonProperty("shapeIndex")
-	private Integer shapeIndex;
-	@JsonIgnore
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@JsonProperty("linkId")
-	public String getLinkId() {
-		return linkId;
-	}
-
-	@JsonProperty("linkId")
-	public void setLinkId(String linkId) {
-		this.linkId = linkId;
-	}
-
-	@JsonProperty("mappedPosition")
-	public MappedPosition getMappedPosition() {
-		return mappedPosition;
-	}
-
-	@JsonProperty("mappedPosition")
-	public void setMappedPosition(MappedPosition mappedPosition) {
-		this.mappedPosition = mappedPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public Waypoint getOriginalPosition() {
-		return originalPosition;
-	}
-
-	@JsonProperty("originalPosition")
-	public void setOriginalPosition(Waypoint originalPosition) {
-		this.originalPosition = originalPosition;
-	}
-
-	@JsonProperty("type")
-	public String getType() {
-		return type;
-	}
-
-	@JsonProperty("type")
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@JsonProperty("spot")
-	public Integer getSpot() {
-		return spot;
-	}
-
-	@JsonProperty("spot")
-	public void setSpot(Integer spot) {
-		this.spot = spot;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public String getSideOfStreet() {
-		return sideOfStreet;
-	}
-
-	@JsonProperty("sideOfStreet")
-	public void setSideOfStreet(String sideOfStreet) {
-		this.sideOfStreet = sideOfStreet;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public String getMappedRoadName() {
-		return mappedRoadName;
-	}
-
-	@JsonProperty("mappedRoadName")
-	public void setMappedRoadName(String mappedRoadName) {
-		this.mappedRoadName = mappedRoadName;
-	}
-
-	@JsonProperty("label")
-	public String getLabel() {
-		return label;
-	}
-
-	@JsonProperty("label")
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	@JsonProperty("shapeIndex")
-	public Integer getShapeIndex() {
-		return shapeIndex;
-	}
-
-	@JsonProperty("shapeIndex")
-	public void setShapeIndex(Integer shapeIndex) {
-		this.shapeIndex = shapeIndex;
-	}
-
-	@JsonAnyGetter
-	public Map<String, Object> getAdditionalProperties() {
-		return this.additionalProperties;
-	}
-
-	@JsonAnySetter
-	public void setAdditionalProperty(String name, Object value) {
-		this.additionalProperties.put(name, value);
-	}
-
-	@Override
-	public String toString() {
-		return linkId.toString() + originalPosition.toString() + " to " + mappedPosition;
-	}
-}
\ No newline at end of file