diff --git a/deegree-documentation/src/main/asciidoc/basics.adoc b/deegree-documentation/src/main/asciidoc/basics.adoc
index e491375dcd..67da1c306f 100644
--- a/deegree-documentation/src/main/asciidoc/basics.adoc
+++ b/deegree-documentation/src/main/asciidoc/basics.adoc
@@ -511,9 +511,7 @@ chapters, but here's a short overview:
 service metadata ("Edit metadata"), edit controller configuration ("Edit
 global config")
 * Feature Stores: Display feature types and number of stored features
-("Info"), Import GML feature collections ("Loader")
-* Metadata Stores: Import metadata sets ("Loader"), create database
-tables ("Setup tables")
+("Info")
 
 === Best practices for creating workspaces
 
diff --git a/deegree-documentation/src/main/asciidoc/lightly.adoc b/deegree-documentation/src/main/asciidoc/lightly.adoc
index 009da3b774..ad4a08a922 100644
--- a/deegree-documentation/src/main/asciidoc/lightly.adoc
+++ b/deegree-documentation/src/main/asciidoc/lightly.adoc
@@ -120,10 +120,9 @@ curl -i -X GET \
 === Example workspace 2: An ISO Catalogue Service setup
 
 This workspace contains a catalogue service (CSW) setup that complies to
-the ISO Application Profile. After downloading and starting it, you will
-have to setup tables in a PostGIS database first. You will need to have
-an empty and spatially-enabled PostGIS database handy that can be
-accessed from the machine that runs deegree webservices.
+the ISO Application Profile. After downloading and starting the workspace,
+you will first need to set up tables in a PostGIS database. Ensure you
+have an empty, spatially-enabled PostGIS database ready for this step.
 
 TIP: Instead of PostGIS, you can also use the workspace with an Oracle
 Spatial or a Microsoft SQL Server database. In order to enable support
@@ -155,40 +154,14 @@ full reinitialization of the workspace:
 .Saving the configuration and reinitializing the workspace
 image::console_workspace_csw4.png[Saving the configuration and reinitializing the workspace,scaledwidth=50.0%]
 
-The indicated problems are gone now, but we still need to create the
-required database tables. Change to the metadata store view (*data
-stores -> metadata*) and click *Setup tables*:
+The indicated problems are gone now, but the required database tables still need to created.
 
 .Metadata store view
 image::console_workspace_csw5.png[Metadata store view,scaledwidth=50.0%]
 
-In the next view, click *Execute*:
+Once you set up the required database tables, you should now have a working, but empty CSW setup.
+You can then connect to the CSW with compliant clients and import data.
 
-.Creating tables for storing ISO metadata records
-image::console_workspace_csw6.png[Creating tables for storing ISO metadata records,scaledwidth=50.0%]
-
-.After table creation
-image::console_workspace_csw7.png[After table creation,scaledwidth=50.0%]
-
-If all went well, you should now have a working, but empty CSW setup.
-You can connect to the CSW with compliant clients and import data.
-
-////
-or use the *send requests* link to send raw CSW requests to the service. The workspace
-comes with some suitable example requests. Use the third drop-down menu
-to select an example request. Entry *complex_insert.xml* can be used to
-insert some ISO example records using a CSW transaction request:
-
-.Choosing example requests
-image::console_workspace_csw8.png[Choosing example requests,scaledwidth=50.0%]
-
-Click *Send*. After successful insertion, some records have been
-inserted into the CSW (respectively the database). You may want to
-explore other example requests as well, e.g. for retrieving records:
-
-.Other example CSW requests
-image::console_workspace_csw9.png[Other example CSW requests,scaledwidth=50.0%]
-////
 [[anchor-workspace-wps]]
 === Example workspace 3: Web Processing Service demo