diff --git a/doc/index.rst b/doc/index.rst
index 26b92485c..f9bc0c41f 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -12,7 +12,6 @@ Please select a topic in the left hand column.
    source/api_changes
    source/client
    source/server
-   source/repl
    source/simulator3
    source/simulator
    source/simulator/simulator
diff --git a/doc/source/_static/examples.tgz b/doc/source/_static/examples.tgz
index 4a2afbabd..f668e09c8 100644
Binary files a/doc/source/_static/examples.tgz and b/doc/source/_static/examples.tgz differ
diff --git a/doc/source/_static/examples.zip b/doc/source/_static/examples.zip
index d512df265..488f958d2 100644
Binary files a/doc/source/_static/examples.zip and b/doc/source/_static/examples.zip differ
diff --git a/doc/source/internals.rst b/doc/source/internals.rst
index a8c8e2854..f9d580d20 100644
--- a/doc/source/internals.rst
+++ b/doc/source/internals.rst
@@ -6,7 +6,6 @@ Pymodbus internals
    :caption: Contents:
 
    library/nullmodem.rst
-   library/datastore.rst
    library/framer.rst
    library/constants.rst
    library/pymodbus.rst
diff --git a/doc/source/library/datastore.rst b/doc/source/library/datastore.rst
deleted file mode 100644
index 3dcc98a8b..000000000
--- a/doc/source/library/datastore.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-Datastore
-=========
-
-Datastore is responsible for managing registers for a server.
-
-
-Datastore classes
------------------
-
-.. autoclass:: pymodbus.datastore.ModbusSequentialDataBlock
-    :members:
-    :member-order: bysource
-
-.. autoclass:: pymodbus.datastore.ModbusSparseDataBlock
-    :members:
-    :member-order: bysource
-
-.. autoclass:: pymodbus.datastore.ModbusDeviceContext
-    :members:
-    :member-order: bysource
-
-.. autoclass:: pymodbus.datastore.ModbusServerContext
-    :members:
-    :member-order: bysource
-
-.. autoclass:: pymodbus.datastore.ModbusSimulatorContext
-    :members:
-    :member-order: bysource
diff --git a/doc/source/repl.rst b/doc/source/repl.rst
deleted file mode 100644
index 78b54be13..000000000
--- a/doc/source/repl.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Pymodbus REPL (Read Evaluate Print Loop)
-=========================================
-
-Pymodbus provides a simple UI to maniplute server/client, this is handled
-by a separate repo `pymodbus-repl <https://github.com/pymodbus-dev/repl>`__
-
-
-Install as pymodbus optional dependency
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-::
-
-   $ pip install ".[repl]"
-
-Install directly from the github repo
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-::
-
-   $ pip install "git+https://github.com/pymodbus-dev/repl"
diff --git a/doc/source/server.rst b/doc/source/server.rst
index 5cfc48ddc..4260206e0 100644
--- a/doc/source/server.rst
+++ b/doc/source/server.rst
@@ -24,3 +24,8 @@ applications to use the server as if it was synchronous.
     :members:
     :undoc-members:
     :show-inheritance:
+
+Datastore for server
+--------------------
+
+:ref:`Datastore definitions`
diff --git a/doc/source/simulator/datamodel.rst b/doc/source/simulator/datamodel.rst
index d60fdeda6..be1ae396b 100644
--- a/doc/source/simulator/datamodel.rst
+++ b/doc/source/simulator/datamodel.rst
@@ -21,8 +21,8 @@ Usage examples
     :language: python
 
 
-Class definitions
-^^^^^^^^^^^^^^^^^
+Datastore definitions
+^^^^^^^^^^^^^^^^^^^^^
 .. autoclass:: pymodbus.simulator.DataType
     :members:
     :undoc-members:
diff --git a/doc/source/simulator3.rst b/doc/source/simulator3.rst
index 78f2f5084..9bacf4a5f 100644
--- a/doc/source/simulator3.rst
+++ b/doc/source/simulator3.rst
@@ -1,7 +1,7 @@
 Simulator (3.x)
 ===============
 
-.. warning:: Beginning with v3.9.0 and ending with v4.0.0 this simulator will be replaced by a new version.
+.. warning:: Beginning with v3.9.0 and ending with v4.0.0 this simulator will be removed by a new version.
 
 The simulator is a full fledged modbus simulator, which is
 constantly being evolved with user ideas / amendments.