diff --git a/src/solanaceae/message3/message_command_dispatcher.cpp b/src/solanaceae/message3/message_command_dispatcher.cpp
index 95f4250..7cfe3ad 100644
--- a/src/solanaceae/message3/message_command_dispatcher.cpp
+++ b/src/solanaceae/message3/message_command_dispatcher.cpp
@@ -2,6 +2,7 @@
 
 #include <solanaceae/util/config_model.hpp>
 #include <solanaceae/util/utils.hpp>
+#include <solanaceae/util/time.hpp>
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/contact/components.hpp>
 
@@ -17,7 +18,7 @@ MessageCommandDispatcher::MessageCommandDispatcher(
 	RegistryMessageModelI& rmm,
 	ConfigModelI& conf
 ) :
-	_cr(cr), _rmm(rmm), _conf(conf), _program_started_at(Message::getTimeMS())
+	_cr(cr), _rmm(rmm), _conf(conf), _program_started_at(getTimeMS())
 {
 	// overwrite default admin and moderator to false
 	_conf.set("MessageCommandDispatcher", "admin", false);
diff --git a/src/solanaceae/message3/registry_message_model.cpp b/src/solanaceae/message3/registry_message_model.cpp
index 65b46a5..ac84939 100644
--- a/src/solanaceae/message3/registry_message_model.cpp
+++ b/src/solanaceae/message3/registry_message_model.cpp
@@ -1,9 +1,4 @@
 #include "./registry_message_model.hpp"
 
-#include <chrono>
-#include <iostream>
-
-uint64_t Message::getTimeMS(void) {
-	return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-}
+// TODO: remove file?
 
diff --git a/src/solanaceae/message3/registry_message_model.hpp b/src/solanaceae/message3/registry_message_model.hpp
index f1aa9d3..602d3e5 100644
--- a/src/solanaceae/message3/registry_message_model.hpp
+++ b/src/solanaceae/message3/registry_message_model.hpp
@@ -31,10 +31,6 @@ namespace Events {
 
 } // Events
 
-// get unix time in milliseconds
-// TODO: move to util
-uint64_t getTimeMS(void);
-
 } // Message
 
 enum class RegistryMessageModel_Event : uint32_t {