CSCfi · rkronberg · Aug 13, 2025 · Aug 13, 2025 · Oct 1, 2025 · Oct 2, 2025
diff --git a/docs/accounts/billing.md b/docs/accounts/billing.md
@@ -24,7 +24,7 @@ CSC's services are free of charge for academic research, teaching or training fo
 
     For LUMI billing, [see the LUMI documentation](https://docs.lumi-supercomputer.eu/runjobs/lumi_env/billing/){ target=_blank }.
 
-    The use of Fairdata IDA and Kaivos doesn't consume Billing Units.
+    The use of Fairdata IDA doesn't consume Billing Units.
 
 ## Monitoring Billing Unit consumption
 

diff --git a/docs/accounts/how-to-add-service-access-for-project.md b/docs/accounts/how-to-add-service-access-for-project.md
@@ -2,7 +2,7 @@
 
 Access can be granted to the following services: supercomputers **Puhti** and
 **Mahti**; cloud services **cPouta** and **Rahti**; storage services **Allas**
-and **IDA**; sensitive data services **SD Services**; and database service **Kaivos**.
+and **IDA**; sensitive data services **SD Services**.
 
 Service access has a two-step approval: (1) The project manager approves
 the service for the project and (2) members approve it for themselves.

diff --git a/docs/accounts/how-to-view-billing-unit-usage.md b/docs/accounts/how-to-view-billing-unit-usage.md
@@ -1,15 +1,14 @@
 # How to view Billing Unit usage
 
-Consumption of CSC's resources is mainly measured in Billing Units. IDA and
-Kaivos do not consume Billing Units; they only have quota limits for each
-project.
+Consumption of CSC's resources is mainly measured in Billing Units. Fairdata
+IDA does not consume Billing Units; it only has a quota limit for each project.
 
 Check your BU consumption:
 
 1. Login to [MyCSC](http://my.csc.fi).
-1. Choose _Projects_ in the navigation menu on the left.
-1. Choose a project.
-1. The usage is shown under _Resource Usage_.
+2. Choose _Projects_ in the navigation menu on the left.
+3. Choose a project.
+4. The usage is shown under _Resource Usage_.
 
 In the usage plot, you can:
 

diff --git a/docs/data/index.md b/docs/data/index.md
@@ -1,7 +1,7 @@
+# Data
+
 ## [Working with data](datasets/dataset-sources.md)
 
 ## [Moving data](moving/index.md)
 
 ## [Allas object storage](Allas/index.md)
-
-## [Kaivos database service](kaivos/overview.md)
diff --git a/docs/data/kaivos/kaivos-account.md b/docs/data/kaivos/kaivos-account.md
diff --git a/docs/data/kaivos/kaivos_batch_job.md b/docs/data/kaivos/kaivos_batch_job.md
diff --git a/docs/data/kaivos/kaivos_client_in_puhti.md b/docs/data/kaivos/kaivos_client_in_puhti.md
diff --git a/docs/data/kaivos/kaivos_import.md b/docs/data/kaivos/kaivos_import.md