     hosts catalog changes in accordance to the users preference)
 
   * Submit the resulting catalog"
-  [{:keys [host lastrun catalog report factset puppetdb-host puppetdb-port run-interval rand-percentage] :as state} clock]
+  [{:keys [host lastrun catalog report factset base-url run-interval rand-percentage] :as state} clock]
   (if-not (> (- clock lastrun) run-interval)
     state
-    (let [base-url {:protocol "http" :host puppetdb-host :port puppetdb-port :prefix "/pdb/query"}
-          catalog (some-> catalog update-catalog (maybe-tweak-catalog rand-percentage))
+    (let [catalog (some-> catalog update-catalog (maybe-tweak-catalog rand-percentage))
           report (some-> report update-report-run-fields)
           factset (some-> factset (update-factset rand-percentage))]
       ;; Submit the catalog and reports in separate threads, so as to not

    (and (contains? options :runinterval)
         (contains? options :nummsgs))
    (do
      (log/error
        "Error: -N/--nummsgs runs immediately and is not compatable with -i/--runinterval")
      (action-on-error-fn))

    (not-any? #{:nummsgs :runinterval} (keys options))

   submission.  Also submit a report for the host (if present). This is
   similar to timed-update-host, but always sends the update (doesn't run/skip
   based on the clock)"
  [{:keys [host lastrun catalog report factset base-url run-interval rand-percentage] :as state}]
  (let [catalog (some-> catalog (maybe-tweak-catalog rand-percentage))
        report (some-> report update-report-run-fields)
        factset (some-> factset (update-factset rand-percentage))]
    (when catalog (client/submit-catalog base-url 6 (json/generate-string catalog)))
