diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java
index ee9b5547..215f7d94 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java
@@ -101,21 +101,6 @@ public abstract class HsBookingItem implements Stringifyable, BaseEntity<HsBooki
     @JoinColumn(name = "parentitemuuid", referencedColumnName = "uuid")
     private List<HsBookingItemRealEntity> subBookingItems;
 
-// FIXME
-    //     @OneToOne(targetEntity = HsHostingAssetRealEntity.class, mappedBy="bookingItem") // does not work in case of subclass HsBookingItemRbacEntity
-//    // because that bookingItem refers to a HsBookingItemRealEntity, not ...Rbac...
-//    @OneToOne(fetch = FetchType.LAZY)
-//    @JoinFormula(
-//            referencedColumnName = "uuid",
-//            value = """
-//            (
-//                SELECT DISTINCT asset.uuid
-//                FROM hs_hosting_asset asset
-//                WHERE asset.uuid=uuid
-//            )
-//            """)
-//    private HsHostingAssetRealEntity relatedHostingAsset;
-
     @Transient
     private PatchableMapWrapper<Object> resourcesWrapper;
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
index d823277f..5d38b372 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.booking.item.validators;
 
-import net.hostsharing.hsadminng.hs.booking.EntityManagerMock;
+import net.hostsharing.hsadminng.hs.hosting.asset.EntityManagerMock;
 import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealEntity;
@@ -20,7 +20,7 @@ import static java.util.Arrays.stream;
 import static java.util.List.of;
 import static java.util.Map.entry;
 import static java.util.Map.ofEntries;
-import static net.hostsharing.hsadminng.hs.booking.EntityManagerMock.createEntityManagerMockWithAssetQueryFake;
+import static net.hostsharing.hsadminng.hs.hosting.asset.EntityManagerMock.createEntityManagerMockWithAssetQueryFake;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_WEBSPACE;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/EntityManagerMock.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/EntityManagerMock.java
similarity index 89%
rename from src/test/java/net/hostsharing/hsadminng/hs/booking/EntityManagerMock.java
rename to src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/EntityManagerMock.java
index 3dfe6973..7b22695e 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/booking/EntityManagerMock.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/EntityManagerMock.java
@@ -1,6 +1,5 @@
-package net.hostsharing.hsadminng.hs.booking;
+package net.hostsharing.hsadminng.hs.hosting.asset;
 
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
 import org.jetbrains.annotations.NotNull;
 
 import jakarta.persistence.EntityManager;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
index 3e3dd10a..9f689591 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
@@ -11,7 +11,6 @@ import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealRepository;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealRepository;
-import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import org.junit.jupiter.api.ClassOrderer;
@@ -53,18 +52,12 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
     @Autowired
     HsHostingAssetRealRepository realAssetRepo;
 
-    @Autowired
-    HsHostingAssetRbacRepository rbacAssetRepo; // FIXME: remove?
-
     @Autowired
     HsBookingItemRealRepository realBookingItemRepo;
 
     @Autowired
     HsBookingProjectRealRepository realProjectRepo;
 
-    @Autowired
-    HsOfficeDebitorRepository debitorRepo; // FIXME: remove?
-
     @Autowired
     HsOfficeContactRealRepository realContactRepo;
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidatorUnitTest.java
index edb9924e..386282f6 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidatorUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidatorUnitTest.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.hosting.asset.validators;
 
-import net.hostsharing.hsadminng.hs.booking.EntityManagerMock;
+import net.hostsharing.hsadminng.hs.hosting.asset.EntityManagerMock;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRbacEntity;