diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index 0a3048a9..01233159 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -101,7 +101,6 @@ tables:
       - bay
       - spring
       waterway:
-      - riverbank
       - dock
       water:
       - river
diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png
index 47f499f0..52e8c444 100644
Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ
diff --git a/layers/water/water.sql b/layers/water/water.sql
index f62d2ae4..9dd3c9e0 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -1,7 +1,6 @@
 CREATE OR REPLACE FUNCTION water_class(waterway text, water text, leisure text) RETURNS text AS
 $$
 SELECT CASE
-           WHEN waterway='riverbank' THEN 'river'
            %%FIELD_MAPPING: class %%
            ELSE 'lake'
            END;
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 21491434..15672e98 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -19,8 +19,7 @@ layer:
     class:
       description: |
           All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
-          Water bodies with the [`waterway=riverbank`](http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank)
-          or [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river) tag are classified as river.  Wet and dry docks
+          Water bodies with the [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river) tag are classified as river.  Wet and dry docks
           tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`. 
           Swimming pools tagged [`leisure=swimming_pool`](https://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool) are classified as a `swimming_pool`
           All other water bodies are classified as `lake`.
@@ -29,7 +28,6 @@ layer:
           waterway: 'dock'
         river:
           water: 'river'
-          waterway: 'riverbank'
         lake:
         ocean:
         swimming_pool:
diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png
index d1e462f3..3bbee61b 100644
Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ