diff --git a/src/narjure/core.clj b/src/narjure/core.clj
index eedfac0..2163b82 100644
--- a/src/narjure/core.clj
+++ b/src/narjure/core.clj
@@ -15,7 +15,6 @@
     [narjure.perception-action
      [operator-executor :refer [operator-executor]]
      [sentence-parser :refer [sentence-parser]]
-     [system-time :refer [system-time]]
      [task-creator :refer [task-creator]]]
     [taoensso.timbre :refer [info set-level!]])
   (:refer-clojure :exclude [promise await])
@@ -33,7 +32,6 @@
     :operator-executor
     :persistence-manager
     :sentence-parser
-    :system-time
     :task-creator
     :task-dispatcher})
 
@@ -47,7 +45,6 @@
   (spawn operator-executor)
   (spawn persistence-manager :state)
   (spawn sentence-parser)
-  (spawn system-time)
   (spawn task-creator)
   (spawn task-dispatcher))
 
@@ -71,7 +68,7 @@
   (! :forgettable-concept-collator [:forgetting-tick-msg]))
 
 (defn system-tick []
-  (! :system-time [:system-time-tick-msg]))
+  (! :task-creator [:system-time-tick-msg]))
 
 (defn prn-ok [msg] (info (format "\t[OK] %s" msg)))
 
diff --git a/src/narjure/perception_action/system_time.clj b/src/narjure/perception_action/system_time.clj
deleted file mode 100644
index 7126290..0000000
--- a/src/narjure/perception_action/system_time.clj
+++ /dev/null
@@ -1,16 +0,0 @@
-(ns narjure.perception-action.system-time
-  (:require
-    [narjure.actor.utils :refer [defactor]]
-    [taoensso.timbre :refer [debug]])
-  (:refer-clojure :exclude [promise await]))
-
-(declare system-time system-time-tick)
-
-(defactor system-time
-  "State is system-time."
-  0
-  {:system-time-tick-msg system-time-tick})
-
-(defn system-time-tick [_ state]
-  ;(debug :system-time (str "process-system-time-tick " state))
-  (inc state))
diff --git a/src/narjure/perception_action/task_creator.clj b/src/narjure/perception_action/task_creator.clj
index 014e2c7..7ad67cb 100644
--- a/src/narjure/perception_action/task_creator.clj
+++ b/src/narjure/perception_action/task_creator.clj
@@ -11,7 +11,12 @@
   - Sets source property based on origin
   - Add serial-no
   - Converts tense to occurrence time (has system time in state)"
-  {:sentence-msg  sentence})
+  {:sentence-msg  sentence
+   :system-time-tick-msg system-time-tick})
 
 (defn sentence [_ _]
   (debug aname "process-sentence"))
+
+(defn system-time-tick [_ state]
+  ;(debug :system-time (str "process-system-time-tick " state))
+  (inc state))