 
 (schema/defn ^:always-validate add-context-handler!
   [context base-path context-path options :- ContextHandlerOptions]
-  (let [defaults          {:server-id         :default
-                           :context-listeners []}
+  (let [defaults          {:context-listeners []}
         opts              (merge defaults options)
         server-id         (:server-id opts)
         context-listeners (:context-listeners opts)


(schema/defn ^:always-validate add-servlet-handler!
  [context servlet path options :- ServletHandlerOptions]
  (let [defaults            {:server-id           :default
                             :servlet-init-params {}}
        opts                (merge defaults options)
        server-id           (:server-id opts)
        servlet-init-params (:servlet-init-params opts)


(schema/defn ^:always-validate add-proxy-route!
  [context target path options]
  (let [server-id (:server-id options)
        s         (get-server-context context server-id)
        state     (:state s)
        endpoint  {:type        :proxy
