diff --git a/rmf_demos_maps/maps/airport_terminal/airport_terminal.building.yaml b/rmf_demos_maps/maps/airport_terminal/airport_terminal.building.yaml
index 1ec5d498..fb7ab9dd 100644
--- a/rmf_demos_maps/maps/airport_terminal/airport_terminal.building.yaml
+++ b/rmf_demos_maps/maps/airport_terminal/airport_terminal.building.yaml
@@ -469,9 +469,6 @@ levels:
       - {model_name: OpenRobotics/WhiteChipChair, name: WhiteChipChair, static: true, x: 930.393, y: 503.253, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/WhiteChipChair, name: WhiteChipChair, static: true, x: 950.8869999999999, y: 502.355, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Pine Tree, name: Pine Tree, static: true, x: 647.158, y: 412.503, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 1036.018, y: 291.823, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 1017.064, y: 291.817, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 998.961, y: 291.823, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/ElectronicsRecycling, name: ElectronicsRecycling, static: true, x: 976.8049999999999, y: 492.417, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/ElectronicsRecycling, name: ElectronicsRecycling, static: true, x: 651.639, y: 363.752, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/ElectronicsRecycling, name: ElectronicsRecycling, static: true, x: 924.029, y: 260.699, yaw: 1.5708, z: 0}
@@ -593,10 +590,6 @@ levels:
       - {model_name: OpenRobotics/FemaleVisitor, name: FemaleVisitor, static: true, x: 313.903, y: 233.706, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Standing person, name: Standing person, static: true, x: 404.474, y: 204.927, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Standing person, name: Standing person, static: true, x: 461.187, y: 257.407, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 292.314, y: 253.243, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 290.89, y: 217.027, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 356.048, y: 255.774, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 356.364, y: 218.134, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Standing person, name: Standing person, static: true, x: 166.439, y: 240.295, yaw: 4.1565, z: 0}
       - {model_name: OpenRobotics/ParkingTrolleyMax, name: ParkingTrolleyMax, static: true, x: 469.602, y: 419.478, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Oak tree, name: Oak tree, static: true, x: 214.636, y: 434.416, yaw: 1.5708, z: 0}
@@ -638,10 +631,6 @@ levels:
       - {model_name: OpenRobotics/FemaleVisitorSit, name: FemaleVisitorSit, static: true, x: 238.988, y: 513.814, yaw: -0.07969999999999999, z: 0}
       - {model_name: OpenRobotics/Pine Tree, name: Pine Tree, static: true, x: 552.067, y: 531.664, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Fountain, name: Fountain, static: true, x: 849.9450000000001, y: 248.569, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 765.346, y: 513.7329999999999, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 744.551, y: 536.453, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 788.066, y: 537.223, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 766.116, y: 562.638, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Bookshelf, name: Bookshelf, static: true, x: 682.789, y: 529.163, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Bookshelf, name: Bookshelf, static: true, x: 682.789, y: 560.1369999999999, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Bookshelf, name: Bookshelf, static: true, x: 682.789, y: 596.6420000000001, yaw: 1.5708, z: 0}
@@ -677,10 +666,6 @@ levels:
       - {model_name: OpenRobotics/FemaleVisitor, name: FemaleVisitor, static: true, x: 560.672, y: 326.258, yaw: -0.8359, z: 0}
       - {model_name: OpenRobotics/FemaleVisitor, name: FemaleVisitor, static: true, x: 668.665, y: 343.536, yaw: 4.5179, z: 0}
       - {model_name: OpenRobotics/FemaleVisitor, name: FemaleVisitor, static: true, x: 516.704, y: 412.366, yaw: 0.906, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 395.229, y: 658.476, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 522.881, y: 574.27, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 522.881, y: 610.2140000000001, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: Cafe table, static: true, x: 522.582, y: 644.96, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Table, name: Table, static: true, x: 484.241, y: 572.473, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Table, name: Table, static: true, x: 484.84, y: 624.8920000000001, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Table, name: Table, static: true, x: 449.495, y: 597.933, yaw: 1.5708, z: 0}
diff --git a/rmf_demos_maps/maps/hotel/hotel.building.yaml b/rmf_demos_maps/maps/hotel/hotel.building.yaml
index 421f94a9..1c08c16a 100644
--- a/rmf_demos_maps/maps/hotel/hotel.building.yaml
+++ b/rmf_demos_maps/maps/hotel/hotel.building.yaml
@@ -105,7 +105,6 @@ levels:
       - {model_name: OpenRobotics/NurseDesk, name: OpenRobotics/NurseDesk, static: true, x: 355.556, y: 505.454, yaw: -0, z: 0}
       - {model_name: OpenRobotics/Sofa, name: OpenRobotics/Sofa, static: true, x: 141.244, y: 482.725, yaw: 0.0066, z: 0}
       - {model_name: OpenRobotics/Sofa, name: OpenRobotics/Sofa, static: true, x: 174.44, y: 516.4930000000001, yaw: 1.5708, z: 0}
-      - {model_name: OpenRobotics/Cafe table, name: OpenRobotics/Cafe table, static: true, x: 174.726, y: 481.294, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/HeadphonesRack1, name: OpenRobotics/HeadphonesRack1, static: true, x: 172.398, y: 565.652, yaw: 0.8903, z: 0}
       - {model_name: OpenRobotics/Bookshelf, name: OpenRobotics/Bookshelf, static: true, x: 139.11, y: 640.347, yaw: 1.5708, z: 0}
       - {model_name: OpenRobotics/Bookshelf, name: OpenRobotics/Bookshelf, static: true, x: 138.759, y: 621.923, yaw: 1.5708, z: 0}