diff --git a/src/main/resources/db/changelog/6-hs-booking/620-booking-item/6200-hs-booking-item.sql b/src/main/resources/db/changelog/6-hs-booking/620-booking-item/6200-hs-booking-item.sql
index 077bc33a..6c76c29f 100644
--- a/src/main/resources/db/changelog/6-hs-booking/620-booking-item/6200-hs-booking-item.sql
+++ b/src/main/resources/db/changelog/6-hs-booking/620-booking-item/6200-hs-booking-item.sql
@@ -25,7 +25,7 @@ create table if not exists hs_booking_item
     resources           jsonb not null,
 
     constraint chk_hs_booking_item_has_project_or_parent_asset
-        check (type in ('CLOUD_SERVER', 'MANAGED_SERVER') or projectUuid is not null or parentItemUuid is not null)
+        check (projectUuid is not null or parentItemUuid is not null)
 );
 --//
 
diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql
index 43bacc43..755dbbec 100644
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql
@@ -32,7 +32,7 @@ create table if not exists hs_hosting_asset
     config              jsonb not null,
 
     constraint chk_hs_hosting_asset_has_booking_item_or_parent_asset
-        check (type in ('CLOUD_SERVER', 'MANAGED_SERVER') or bookingItemUuid is not null or parentAssetUuid is not null)
+        check (bookingItemUuid is not null or parentAssetUuid is not null)
 );
 --//
 
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 6e02e719..d11e7278 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
@@ -222,7 +222,6 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
 
             final var location = RestAssured // @formatter:off
                     .given()
-                        //.header("current-user", "superuser-alex@hostsharing.net", "hs_hosting_asset#"+givenParentAsset.getIdentifier()+":ADMIN")
                         .header("current-user", "superuser-alex@hostsharing.net")
                         .header("assumed-roles", "hs_hosting_asset#vm1011:ADMIN")
                         .contentType(ContentType.JSON)
diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java
index bfd47e7c..e80f8ce6 100644
--- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java
+++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java
@@ -41,11 +41,6 @@ public class RawRbacRoleEntity {
     @NotNull
     public static List<String> distinctRoleNamesOf(@NotNull final List<RawRbacRoleEntity> roles) {
         // TODO: remove .distinct() once partner.person + partner.contract are removed
-        roles.forEach(r -> {
-            if (r.getRoleName() == null) {
-                r.toString();
-            }
-        });
         return roles.stream().map(RawRbacRoleEntity::getRoleName).sorted().distinct().toList();
     }