diff --git a/layers/building/building.sql b/layers/building/building.sql
index d41f233..271ef54 100644
--- a/layers/building/building.sql
+++ b/layers/building/building.sql
@@ -15,7 +15,6 @@ LANGUAGE plpgsql IMMUTABLE;
 
 CREATE INDEX IF NOT EXISTS osm_building_relation_building_idx ON osm_building_relation(building) WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon';
 CREATE INDEX IF NOT EXISTS osm_building_relation_member_idx ON osm_building_relation(member) WHERE role = 'outline';
---CREATE INDEX IF NOT EXISTS osm_building_associatedstreet_role_idx ON osm_building_associatedstreet(role) WHERE ST_GeometryType(geometry) = 'ST_Polygon';
 
 CREATE OR REPLACE VIEW osm_all_buildings AS (
          -- etldoc: osm_building_relation -> layer_building:z14_
@@ -32,20 +31,6 @@ CREATE OR REPLACE VIEW osm_all_buildings AS (
          osm_building_relation WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon'
          UNION ALL
 
-         -- etldoc: osm_building_associatedstreet -> layer_building:z14_
-         -- Buildings in associatedstreet relations
-         SELECT member AS osm_id,geometry,
-                  COALESCE(nullif(as_numeric(height),-1),nullif(as_numeric(buildingheight),-1)) as height,
-                  COALESCE(nullif(as_numeric(min_height),-1),nullif(as_numeric(buildingmin_height),-1)) as min_height,
-                  COALESCE(nullif(as_numeric(levels),-1),nullif(as_numeric(buildinglevels),-1)) as levels,
-                  COALESCE(nullif(as_numeric(min_level),-1),nullif(as_numeric(buildingmin_level),-1)) as min_level,
-                  nullif(material, '') AS material,
-                  nullif(colour, '') AS colour,
-                  FALSE as hide_3d
-         FROM
-         osm_building_associatedstreet WHERE role = 'house' AND ST_GeometryType(geometry) = 'ST_Polygon'
-         UNION ALL
-
          -- etldoc: osm_building_polygon -> layer_building:z14_
          -- Standalone buildings
          SELECT obp.osm_id,obp.geometry,
diff --git a/layers/building/etl_diagram.png b/layers/building/etl_diagram.png
index 8c45f41..53f5f04 100644
Binary files a/layers/building/etl_diagram.png and b/layers/building/etl_diagram.png differ
diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml
index 294622d..ce72b97 100644
--- a/layers/building/mapping.yaml
+++ b/layers/building/mapping.yaml
@@ -67,98 +67,6 @@ tables:
         man_made: ["bridge"]
     type: polygon
 
-  # etldoc: imposm3 -> osm_building_associatedstreet
-  building_associatedstreet:
-    columns:
-    - name: osm_id
-      type: id
-    - name: geometry
-      type: validated_geometry
-    - name: area
-      type: area
-    - name: building
-      key: building
-      type: string
-      from_member: true
-    - name: material
-      key: building:material
-      type: string
-    - name: colour
-      key: building:colour
-      type: string
-    - name: buildingpart
-      key: building:part
-      type: string
-      from_member: true
-    - name: buildingheight
-      key: building:height
-      type: string
-      from_member: true
-    - name: height
-      key: height
-      type: string
-      from_member: true
-    - name: buildingmin_height
-      key: building:min_height
-      type: string
-      from_member: true
-    - name: min_height
-      key: min_height
-      type: string
-      from_member: true
-    - name: buildinglevels
-      key: building:levels
-      type: string
-      from_member: true
-    - name: levels
-      key: levels
-      type: string
-      from_member: true
-    - name: buildingmin_level
-      key: building:min_level
-      type: string
-      from_member: true
-    - name: min_level
-      key: min_level
-      type: string
-      from_member: true
-    - name: relbuildingheight
-      key: building:height
-      type: string
-    - name: relheight
-      key: height
-      type: string
-    - name: relbuildingmin_height
-      key: building:min_height
-      type: string
-    - name: relmin_height
-      key: min_height
-      type: string
-    - name: relbuildinglevels
-      key: building:levels
-      type: string
-    - name: rellevels
-      key: levels
-      type: string
-    - name: relbuildingmin_level
-      key: building:min_level
-      type: string
-    - name: relmin_level
-      key: min_level
-      type: string
-    - name: member
-      type: member_id
-    - name: index
-      type: member_index
-    - name: role
-      type: member_role
-      from_member: true
-    - name: type
-      type: member_type
-    mapping:
-      type: [associatedStreet]
-    type: relation_member
-
   # etldoc: imposm3 -> osm_building_relation
   building_relation:
     columns:
diff --git a/layers/building/mapping_diagram.png b/layers/building/mapping_diagram.png
index 72a55a5..f27e789 100644
Binary files a/layers/building/mapping_diagram.png and b/layers/building/mapping_diagram.png differ