     update-fn))
 
 (defn remove-midi-control-to-master-mapping
-  "Cease updating the specified [[dimmer/master]] when the specified
+  "Deprecated: There is no reason to use this function, it is simpler
+  to call [[remove-control-mapping]] directly.
+
+  Cease updating the specified [[dimmer/master]] when the specified
   MIDI controller-change messages are received. `f` is the function
   that was returned by [[add-midi-control-to-master-mapping]] when
   this relationship was established."
+  {:deprecated "0.2.0"}
   [device-filter channel control-number f & {:keys [master] :or {master (:grand-master *show*)}}]
   {:pre [(some? *show*) (some? device-filter) (integer? channel) (<= 0 channel 15)
          (integer? control-number) (<= 0 control-number 127)]}
-  (let [bound (bind-keyword-param master Master (:grand-master *show*))
-        master (resolve-param bound *show* (rhythm/metro-snapshot (:metronome *show*)))]
-    (midi/remove-control-mapping device-filter channel control-number f)))
+  (midi/remove-control-mapping device-filter channel control-number f))
 
 (defn- add-midi-control-metronome-mapping
   "Helper function to perform some action on a metronome when a

    update-fn))

(defn remove-midi-control-to-var-mapping
  "Cease updating the specified variable in [[*show*]] when the
  specified MIDI controller-change messages are received. `f` is the
  function that was returned by [[add-midi-control-to-var-mapping]]
  when this relationship was created."
  [device-filter channel control-number variable f]
  {:pre [(some? *show*) (some? device-filter) (integer? channel) (<= 0 channel 15)
         (integer? control-number) (<= 0 control-number 127) (some? variable)]}

  metronome attached to [[*show*]] is unmapped.

  Returns a MIDI mapping function which can be passed
  to [[remove-control-mapping]] if you later want to stop the
  metronome from being affected by these MIDI messages."
  [device-filter channel control-number & {:keys [metronome] :or {metronome (:metronome *show*)}}]
  (add-midi-control-metronome-mapping device-filter channel control-number metronome
                                      #(rhythm/metro-bar-start % (rhythm/metro-bar %))))
