diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index 6b56cc432b6266039208ad37d552ef39c39d6e5c..4ee7e461279c24d83a67e7739b2df3f17ae1a822 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -17,7 +17,6 @@ armarx_add_library(core
         Graph.cpp
         aron_conversions.cpp
         json_conversions.cpp
-        time/ChronoMonotonicTimeServer.cpp
     HEADERS
         Trajectory.h
         constants.h
@@ -35,8 +34,6 @@ armarx_add_library(core
         TopologicScene.h
         aron_conversions.h
         json_conversions.h
-        time/ChronoMonotonicTimeServer.h
-        time/TimeServerInterface.h
     DEPENDENCIES_PUBLIC
         ArmarXCoreInterfaces
         ArmarXCore
diff --git a/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.cpp b/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.cpp
deleted file mode 100644
index fb3db7cb1dc0f96915ed982c820690a6fc5ad1e1..0000000000000000000000000000000000000000
--- a/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ChronoMonotonicTimeServer.h"
-
-#include <ArmarXCore/core/time/Clock.h>
-
-namespace armarx::navigation::core
-{
-    armarx::core::time::DateTime
-    ChronoMonotonicTimeServer::now() const
-    {
-        return armarx::Clock::Now();
-    }
-
-} // namespace armarx::navigation::core
diff --git a/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.h b/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.h
deleted file mode 100644
index 31d6cf7e5f7c521aead76f179ef56b83f20f6f2a..0000000000000000000000000000000000000000
--- a/source/armarx/navigation/core/time/ChronoMonotonicTimeServer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * This file is part of ArmarX.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author     Fabian Reister ( fabian dot reister at kit dot edu )
- * @date       2021
- * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
- *             GNU General Public License
- */
-
-#pragma once
-
-#include <armarx/navigation/core/time/TimeServerInterface.h>
-#include <armarx/navigation/core/types.h>
-
-
-namespace armarx::navigation::core
-{
-
-    class ChronoMonotonicTimeServer : virtual public TimeServerInterface
-    {
-    public:
-        armarx::core::time::DateTime now() const override;
-
-        ~ChronoMonotonicTimeServer() override = default;
-    };
-} // namespace armarx::navigation::core
diff --git a/source/armarx/navigation/core/time/TimeServerInterface.h b/source/armarx/navigation/core/time/TimeServerInterface.h
deleted file mode 100644
index fdb74e854d19b41fd47a0db71a3e7a71f22fe0dd..0000000000000000000000000000000000000000
--- a/source/armarx/navigation/core/time/TimeServerInterface.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * This file is part of ArmarX.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @author     Fabian Reister ( fabian dot reister at kit dot edu )
- * @date       2021
- * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
- *             GNU General Public License
- */
-
-#pragma once
-
-#include "ArmarXCore/core/time/DateTime.h"
-
-namespace armarx::navigation::core
-{
-
-    class TimeServerInterface
-    {
-    public:
-        virtual armarx::core::time::DateTime now() const = 0;
-
-        virtual ~TimeServerInterface() = default;
-    };
-} // namespace armarx::navigation::core
diff --git a/source/armarx/navigation/core/types.h b/source/armarx/navigation/core/types.h
index 3cc0851203e29c9e9d88c2ba8860e5734fd0b545..7d338dfd201520aeef8a567d9427fc932503d09b 100644
--- a/source/armarx/navigation/core/types.h
+++ b/source/armarx/navigation/core/types.h
@@ -78,14 +78,14 @@ namespace armarx::navigation::core
 
     struct Scene
     {
-        std::optional<core::StaticScene> staticScene = std::nullopt;
+        DateTime timestamp = DateTime::Invalid();
 
+        std::optional<core::StaticScene> staticScene = std::nullopt;
         std::optional<core::DynamicScene> dynamicScene = std::nullopt;
-        // TopologicMapPtr topologicMap;
+
         VirtualRobot::RobotPtr robot;
 
         std::optional<core::SceneGraph> graph;
-        TimeServerInterface* timeServer;
     };
 
     struct PIDParams