   (info @server-state)
   (when (:http-server? @server-state)
     (run-server (site #'all-routes) {:port (:port @server-state) :join? false}))
-  (let [{:keys [follow track handler credentials]} (:app @server-state)]
-    (start-filter-stream follow track handler credentials))
+  (start-stream server-state)
   (when (:backup? @server-state)
     (start-executor (:backup-folder @server-state))))
 

    (swap! state update-in [:app :recent-tweets] (fn [old new] (vec (take 100 (into [new] old)))) tweet)))



(defn initialize
  "Initialize the server state using a given config file"
  [state path]

  "Dispatch incoming websocket-requests"
  [{:keys [topic data] :as package}]
  (case topic
    :tweets-count (assoc package :data (curator/get-tweet-count))
    :init (assoc package :data
                 {:recent-articles (-> @server-state :app :recent-articles)
