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 2927ef9..4089113 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,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class AsyncJob {
 
     String type = null
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 06327b4..c9ef455 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
@@ -1,10 +1,7 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
 import java.time.OffsetDateTime
 
-@Canonical
 class Draftset {
 
   Draftset(Map map) {
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 9ed1172..0234d9b 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Error.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Error.groovy
@@ -1,8 +1,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class Error {
 
     String type = null
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 63bf47a..4f57065 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,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class ErrorException {
 
   /* An error message relating to the specific exception */
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 ae08a21..c6abd8b 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,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class FinishedJob {
 
     String type = null
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 4cd6cf5..ee6f3d0 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,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class Graph {
 
     String status = null
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 459e2fc..45e9ebb 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,5 @@
 package uk.org.gss_data.pmd_drafter.model
 
-import groovy.transform.Canonical
-
-@Canonical
 class User {
 
   /* Username of the user */