diff --git a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagDisplayPointResource.java b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagDisplayPointResource.java
index d92bf90..3bb6179 100644
--- a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagDisplayPointResource.java
+++ b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagDisplayPointResource.java
@@ -3,10 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.properties.IntegerProperty;
-import io.swagger.models.properties.StringProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.patientflags.DisplayPoint;
@@ -75,16 +71,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		return description;
 	}
 
-	@Override
-	public Model getGETModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getGETModel(rep);
-		return model
-				.property("uuid", new StringProperty())
-				.property("displayPointId", new IntegerProperty())
-				.property("name", new StringProperty())
-				.property("auditInfo", new StringProperty());
-    }
-
 	@Override
 	protected PageableResult doGetAll(RequestContext context) throws ResponseException {
 		return new NeedsPaging<DisplayPoint>(getService().getAllDisplayPoints(), context);
diff --git a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagFlagResource.java b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagFlagResource.java
index 3bb0eed..e6ca36e 100644
--- a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagFlagResource.java
+++ b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagFlagResource.java
@@ -6,11 +6,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.properties.BooleanProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Patient;
 import org.openmrs.api.context.Context;
@@ -99,42 +94,6 @@ public DelegatingResourceDescription getUpdatableProperties() {
 		return cp;
 	}
 
-	@Override
-	public Model getGETModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getGETModel(rep);
-		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
-			model.property("uuid", new StringProperty());
-			model.property("name", new StringProperty());
-			model.property("criteria", new StringProperty());
-			model.property("evaluator", new StringProperty());
-			model.property("message", new StringProperty());
-			model.property("priority", new RefProperty("#/definitions/PatientflagsPriorityGet"));
-			model.property("enabled", new BooleanProperty());
-			model.property("tags", new RefProperty("#/definitions/PatientflagsTagGet"));
-			model.property("auditInfo", new StringProperty());
-		}
-		return model;
-	}
-
-	@Override
-	public Model getCREATEModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getCREATEModel(rep);
-		model.property("name", new StringProperty());
-		model.property("criteria", new StringProperty());
-		model.property("evaluator", new StringProperty());
-		model.property("message", new StringProperty());
-		model.property("priority", new RefProperty("#/definitions/PatientflagsPriorityCreate"));
-		model.property("enabled", new BooleanProperty());
-		model.property("tags", new RefProperty("#/definitions/PatientflagsTagCreate"))
-				.required("name").required("criteria").required("evaluator").required("message");
-        return model;
-    }
-
-	@Override
-	public Model getUPDATEModel(Representation rep) {
-		return getCREATEModel(rep);
-	}
-
 	@Override
 	public Flag getByUniqueId(String flagId) {
 		Flag flag = Context.getService(FlagService.class).getFlagByUuid(flagId);
diff --git a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagPriorityResource.java b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagPriorityResource.java
index 7d0cddd..1dda2cd 100644
--- a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagPriorityResource.java
+++ b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagPriorityResource.java
@@ -4,10 +4,6 @@
 
 import java.util.Arrays;
 
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.properties.IntegerProperty;
-import io.swagger.models.properties.StringProperty;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.patientflags.Priority;
 import org.openmrs.module.patientflags.api.FlagService;
@@ -51,20 +47,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		return description;
 	}
 
-	@Override
-	public Model getGETModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getGETModel(rep);
-		if (rep instanceof FullRepresentation) {
-			model.property("auditInfo", new IntegerProperty());
-		} else if (rep instanceof DefaultRepresentation) {
-			model
-					.property("name", new StringProperty())
-					.property("style", new StringProperty())
-					.property("rank", new IntegerProperty());
-		}
-		return model;
-	}
-
 	public Priority newDelegate() {
 		return new Priority();
 	}
@@ -84,16 +66,6 @@ public DelegatingResourceDescription getCreatableProperties() {
 		return cp;
 	}
 
-	@Override
-	public Model getCREATEModel(Representation rep) {
-		return new ModelImpl().property("name", new StringProperty()).property("style", new StringProperty()).property("rank", new IntegerProperty());
-	}
-
-	@Override
-	public Model getUPDATEModel(Representation rep) {
-		return getCREATEModel(rep);
-	}
-
 	@Override
 	public DelegatingResourceDescription getUpdatableProperties() {
 		DelegatingResourceDescription cp = super.getUpdatableProperties();
diff --git a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagResource.java b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagResource.java
index ee5f136..4fd4095 100644
--- a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagResource.java
+++ b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagResource.java
@@ -1,10 +1,5 @@
 package org.openmrs.module.patientflags.web.rest.resources;
 
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.properties.BooleanProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Patient;
 import org.openmrs.api.context.Context;
@@ -65,31 +60,6 @@ public DelegatingResourceDescription getCreatableProperties() throws ResourceDoe
         return cp;
     }
 
-	@Override
-	public Model getGETModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getGETModel(rep);
-		return model
-				.property("uuid", new StringProperty())
-				.property("message", new StringProperty())
-				.property("patient", new RefProperty("#/definitions/PatientGet"))
-				.property("flag", new RefProperty("#/definitions/PatientflagsFlagGet"))
-				.property("tags", new RefProperty("#/definitions/PatientflagsTagCreate"))
-				.property("voided", new BooleanProperty());
-	}
-
-	@Override
-	public Model getCREATEModel(Representation rep) {
-		return new ModelImpl()
-				.property("patient", new RefProperty("#/definitions/PatientCreate"))
-				.property("flag", new RefProperty("#/definitions/PatientflagsFlagCreate"))
-				.property("message", new StringProperty());
-	}
-
-	@Override
-	public Model getUPDATEModel(Representation rep) {
-		return getCREATEModel(rep);
-	}
-
 	@Override
 	public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoesNotSupportOperationException {
 		return getCreatableProperties();
diff --git a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagTagResource.java b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagTagResource.java
index 9178eaa..1df3402 100644
--- a/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagTagResource.java
+++ b/omod/src/main/java/org/openmrs/module/patientflags/web/rest/resources/PatientFlagTagResource.java
@@ -3,12 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.IntegerProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.patientflags.Tag;
@@ -72,28 +66,6 @@ public DelegatingResourceDescription getCreatableProperties() {
 		return cp;
 	}
 
-	@Override
-	public Model getCREATEModel(Representation rep) {
-		return new ModelImpl()
-				.property("name", new StringProperty())
-				.property("roles", new ArrayProperty(new RefProperty("#/definitions/RoleCreate")))
-				.property("displayPoints", new ArrayProperty(new RefProperty("#/definitions/PatientflagsDisplaypointCreate")));
-	}
-
-	@Override
-	public Model getUPDATEModel(Representation rep) {
-		return getCREATEModel(rep);
-	}
-
-	@Override
-	public Model getGETModel(Representation rep) {
-		ModelImpl model = (ModelImpl) super.getGETModel(rep);
-		return model.property("tagId", new IntegerProperty()).property("name", new StringProperty())
-				.property("roles", new ArrayProperty(new RefProperty("#/definitions/RoleGet")))
-				.property("displayPoints", new ArrayProperty(new RefProperty("#/definitions/PatientflagsDisplaypointGet")))
-				.property("auditInfo", new StringProperty());
-	}
-
 	@Override
 	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
 		DelegatingResourceDescription description = null;
diff --git a/pom.xml b/pom.xml
index 0a581c1..5242c8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
 		<uiframeworkVersion>3.11.0</uiframeworkVersion>
 		<metadatadeployVersion>1.8.1</metadatadeployVersion>
 		<metadatasharingVersion>1.2.2</metadatasharingVersion>
-		<webservices.rest-omod.version>2.40.0</webservices.rest-omod.version>
+		<webservices.rest-omod.version>2.47.0-SNAPSHOT</webservices.rest-omod.version>
 		<legacyuiVersion>1.16.0</legacyuiVersion>
 		<fhirversion>2.0.0</fhirversion>
 		<lombokVersion>1.18.26</lombokVersion>