diff --git a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java
index 0806253c24..881dff5605 100644
--- a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java
+++ b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java
@@ -303,7 +303,7 @@ public ResponseEntity<ItemsByCategory> getTicketCategories(@PathVariable("eventN
             //
             var saleableAdditionalServices = additionalServiceRepository.loadAllForEvent(event.getId())
                 .stream()
-                .map(as -> new SaleableAdditionalService(event, as, null, null, promoCode.orElse(null), 0))
+                .map(as -> new SaleableAdditionalService(event, as, promoCode.orElse(null)))
                 .filter(SaleableAdditionalService::isNotExpired)
                 .collect(Collectors.toList());
 
diff --git a/src/main/java/alfio/controller/decorator/EventDescriptor.java b/src/main/java/alfio/controller/decorator/EventDescriptor.java
deleted file mode 100644
index f481b54159..0000000000
--- a/src/main/java/alfio/controller/decorator/EventDescriptor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * This file is part of alf.io.
- *
- * alf.io is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * alf.io is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with alf.io.  If not, see <http://www.gnu.org/licenses/>.
- */
-package alfio.controller.decorator;
-
-import alfio.model.Event;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.experimental.Delegate;
-import org.apache.commons.lang3.StringUtils;
-
-public class EventDescriptor {
-
-    @Delegate(excludes = ExcludeDelegate.class)
-    private final Event event;
-    private final String eventDescription;
-
-    public EventDescriptor(Event event, String eventDescription) {
-        this.event = event;
-        this.eventDescription = eventDescription;
-    }
-
-    public String getDescription() {
-        return eventDescription;
-    }
-
-    public String getShortDescription() {
-        return StringUtils.abbreviate(getDescription(), 100);
-    }
-
-
-    public boolean getVatIncluded() {
-        return event.isVatIncluded();
-    }
-
-    @JsonIgnore
-    public Event getEvent() {
-        return event;
-    }
-
-    @JsonIgnore
-    public String getPrivateKey() {
-        return event.getPrivateKey();
-    }
-
-    public interface ExcludeDelegate {
-        String getPrivateKey();
-    }
-}
diff --git a/src/main/java/alfio/controller/decorator/SaleableAdditionalService.java b/src/main/java/alfio/controller/decorator/SaleableAdditionalService.java
index 1a5b022002..38181cae3e 100644
--- a/src/main/java/alfio/controller/decorator/SaleableAdditionalService.java
+++ b/src/main/java/alfio/controller/decorator/SaleableAdditionalService.java
@@ -31,22 +31,12 @@ public class SaleableAdditionalService implements PriceContainer {
     private final Event event;
     @Delegate(excludes = {Exclusions.class, PriceContainer.class})
     private final AdditionalService additionalService;
-    private final String title;
-    private final String description;
     private final PromoCodeDiscount promoCodeDiscount;
-    private final int index;
 
-    public SaleableAdditionalService(Event event, AdditionalService additionalService, String title, String description, PromoCodeDiscount promoCodeDiscount, int index) {
+    public SaleableAdditionalService(Event event, AdditionalService additionalService, PromoCodeDiscount promoCodeDiscount) {
         this.event = event;
         this.additionalService = additionalService;
-        this.title = title;
-        this.description = description;
         this.promoCodeDiscount = promoCodeDiscount;
-        this.index = index;
-    }
-
-    public SaleableAdditionalService withIndex(int index) {
-        return new SaleableAdditionalService(this.event, this.additionalService, this.title, this.description, this.promoCodeDiscount, index);
     }
 
     public boolean isExpired() {
diff --git a/src/main/java/alfio/controller/decorator/SaleableTicketCategory.java b/src/main/java/alfio/controller/decorator/SaleableTicketCategory.java
index 417b5e1210..7a6cd667ad 100644
--- a/src/main/java/alfio/controller/decorator/SaleableTicketCategory.java
+++ b/src/main/java/alfio/controller/decorator/SaleableTicketCategory.java
@@ -25,7 +25,6 @@
 import java.math.BigDecimal;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 
 public class SaleableTicketCategory implements PriceContainer {