diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/AuxiliaryMethodsRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/AuxiliaryMethodsRest.java
index 39a55401..b688ce39 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/AuxiliaryMethodsRest.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/AuxiliaryMethodsRest.java
@@ -12,12 +12,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import eu.europeana.api.common.config.swagger.SwaggerSelect;
+import org.springframework.web.bind.annotation.RestController;
 import eu.europeana.api.commons.definitions.statistics.UsageStatsFields;
 import eu.europeana.api.commons.definitions.statistics.set.SetMetric;
 import eu.europeana.api.commons.definitions.vocabulary.CommonApiConstants;
@@ -43,8 +42,7 @@
 import eu.europeana.set.web.utils.UserSetXMLSerializer;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-@Controller
-@SwaggerSelect
+@RestController
 @Tag(name = "Auxiliary Methods")
 public class AuxiliaryMethodsRest extends BaseRest {
 
diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/SearchUserSetRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/SearchUserSetRest.java
index 8a03973b..b92a7ee2 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/SearchUserSetRest.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/SearchUserSetRest.java
@@ -7,13 +7,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
-import eu.europeana.api.common.config.swagger.SwaggerSelect;
+import org.springframework.web.bind.annotation.RestController;
 import eu.europeana.api.commons.definitions.search.ResultSet;
 import eu.europeana.api.commons.definitions.vocabulary.CommonApiConstants;
 import eu.europeana.api.commons.web.exception.HttpException;
@@ -38,8 +37,7 @@
 import eu.europeana.set.web.service.controller.BaseRest;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-@Controller
-@SwaggerSelect
+@RestController
 @Tag(name = "User Set Discovery API")
 public class SearchUserSetRest extends BaseRest {
 
diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java
index 4685c4a0..a0748cc1 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java
@@ -11,7 +11,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,8 +22,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.core.JsonParseException;
-import eu.europeana.api.common.config.swagger.SwaggerSelect;
 import eu.europeana.api.commons.definitions.config.i18n.I18nConstants;
 import eu.europeana.api.commons.definitions.exception.DateParsingException;
 import eu.europeana.api.commons.definitions.utils.DateUtils;
@@ -60,8 +59,7 @@
  * This class implements the User Set - REST API
  */
 
-@Controller
-@SwaggerSelect
+@RestController
 @Tag(name = "Web User Set API", description= "Perform CRUD Operations for User Sets" )
 public class WebUserSetRest extends BaseRest {