diff --git a/src/uk/org/gss_data/pmd_drafter/api/DraftsetsApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/DraftsetsApi.groovy
index c3516e6..f7925f7 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/DraftsetsApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/DraftsetsApi.groovy
@@ -1,14 +1,7 @@
-package uk.org.gss_data.pmd_drafter.api;
+package uk.org.gss_data.pmd_drafter.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
-
-import io.swagger.model.AsyncJob
-import io.swagger.model.Draftset
-
-import java.util.*;
+import uk.org.gss_data.pmd_drafter.model.AsyncJob
+import uk.org.gss_data.pmd_drafter.model.Draftset
 
 @Mixin(ApiUtils)
 class DraftsetsApi {
diff --git a/src/uk/org/gss_data/pmd_drafter/api/JobsApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/JobsApi.groovy
index 7600883..46a72d1 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/JobsApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/JobsApi.groovy
@@ -1,13 +1,6 @@
-package uk.org.gss_data.pmd_drafter.api;
+package uk.org.gss_data.pmd_drafter.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
-
-import io.swagger.model.FinishedJob
-
-import java.util.*;
+import uk.org.gss_data.pmd_drafter.model.FinishedJob
 
 @Mixin(ApiUtils)
 class JobsApi {
diff --git a/src/uk/org/gss_data/pmd_drafter/api/MetadataApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/MetadataApi.groovy
index 41dddf6..ead79e6 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/MetadataApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/MetadataApi.groovy
@@ -1,13 +1,6 @@
-package uk.org.gss_data.pmd_drafter.api;
+package uk.org.gss_data.pmd_drafter.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
-
-import io.swagger.model.Draftset
-
-import java.util.*;
+import uk.org.gss_data.pmd_drafter.model.Draftset
 
 @Mixin(ApiUtils)
 class MetadataApi {
@@ -40,7 +33,7 @@
         // create path and map path parameters (TODO)
         String resourcePath = "/draftset/{id}"
 
-        // query params
+        // query paramsGrap
         def queryParams = [:]
         def headerParams = [:]
     
diff --git a/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
index 120a300..08292e3 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
@@ -1,6 +1,4 @@
-package uk.org.gss_data.pmd_drafter.api;
-
-import io.swagger.api.ApiUtils
+package uk.org.gss_data.pmd_drafter.api
 
 @Mixin(ApiUtils)
 class QueryingApi {
@@ -23,7 +21,7 @@
         if (!"null".equals(String.valueOf(graph)))
             queryParams.put("graph", String.valueOf(graph))
 if (!"null".equals(String.valueOf(unionWithLive)))
-            queryParams.put("union-with-live", String.valueOf(unionWithLive))
+            queryParams.put("union-with-live", String.GrapvalueOf(unionWithLive))
 if (!"null".equals(String.valueOf(timeout)))
             queryParams.put("timeout", String.valueOf(timeout))
 
diff --git a/src/uk/org/gss_data/pmd_drafter/api/SparqlEndpointsApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/SparqlEndpointsApi.groovy
index f94109e..4ce1cb5 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/SparqlEndpointsApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/SparqlEndpointsApi.groovy
@@ -1,6 +1,4 @@
-package uk.org.gss_data.pmd_drafter.api;
-
-import io.swagger.api.ApiUtils
+package uk.org.gss_data.pmd_drafter.api
 
 @Mixin(ApiUtils)
 class SparqlEndpointsApi {
diff --git a/src/uk/org/gss_data/pmd_drafter/api/UpdatingDataApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/UpdatingDataApi.groovy
index 6e3b872..7eae024 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/UpdatingDataApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/UpdatingDataApi.groovy
@@ -1,14 +1,7 @@
-package uk.org.gss_data.pmd_drafter.api;
+package uk.org.gss_data.pmd_drafter.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
-
-import io.swagger.model.AsyncJob
-import io.swagger.model.Draftset
-
-import java.util.*;
+import uk.org.gss_data.pmd_drafter.model.AsyncJob
+import uk.org.gss_data.pmd_drafter.model.Draftset
 
 @Mixin(ApiUtils)
 class UpdatingDataApi {
diff --git a/src/uk/org/gss_data/pmd_drafter/api/UsersApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/UsersApi.groovy
index 822ca1b..b5d97db 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/UsersApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/UsersApi.groovy
@@ -1,13 +1,6 @@
-package uk.org.gss_data.pmd_drafter.api;
+package uk.org.gss_data.pmd_drafter.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
-
-import io.swagger.model.User
-
-import java.util.*;
+import uk.org.gss_data.pmd_drafter.model.User
 
 @Mixin(ApiUtils)
 class UsersApi {
diff --git a/src/uk/org/gss_data/pmd_drafter/model/AsyncJob.groovy b/src/uk/org/gss_data/pmd_drafter/model/AsyncJob.groovy
index 2ad2cd6..2927ef9 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/AsyncJob.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/AsyncJob.groovy
@@ -1,8 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 @Canonical
 class AsyncJob {
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy b/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
index c041733..06327b4 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
@@ -1,12 +1,8 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Graph;
-import java.util.UUID;
-import java.util.List;
-import java.time.OffsetDateTime;
+
+import java.time.OffsetDateTime
 
 @Canonical
 class Draftset {
@@ -40,7 +36,7 @@
   String currentOwner = null
 
   /* The owner who submitted this Draftset for review */
-  String submittedBy = null
+  String submittedBy = nullGrap
 
   /* The required role for users who can claim this Draftset */
   String claimRole = null
diff --git a/src/uk/org/gss_data/pmd_drafter/model/Error.groovy b/src/uk/org/gss_data/pmd_drafter/model/Error.groovy
index 168d26d..9ed1172 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Error.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Error.groovy
@@ -1,9 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.ErrorException;
+
 @Canonical
 class Error {
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/ErrorException.groovy b/src/uk/org/gss_data/pmd_drafter/model/ErrorException.groovy
index 7184e96..63bf47a 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/ErrorException.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/ErrorException.groovy
@@ -1,8 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 @Canonical
 class ErrorException {
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/FinishedJob.groovy b/src/uk/org/gss_data/pmd_drafter/model/FinishedJob.groovy
index 1e87979..ae08a21 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/FinishedJob.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/FinishedJob.groovy
@@ -1,8 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 @Canonical
 class FinishedJob {
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/Graph.groovy b/src/uk/org/gss_data/pmd_drafter/model/Graph.groovy
index edca35f..4cd6cf5 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Graph.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Graph.groovy
@@ -1,8 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 @Canonical
 class Graph {
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/User.groovy b/src/uk/org/gss_data/pmd_drafter/model/User.groovy
index d0b856d..459e2fc 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/User.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/User.groovy
@@ -1,8 +1,7 @@
-package uk.org.gss_data.pmd_drafter.model;
+package uk.org.gss_data.pmd_drafter.model
 
 import groovy.transform.Canonical
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 @Canonical
 class User {