 
 (defn quaff-cell-at-pos
   ([state]
-  (let [cell      (apply rw/get-cell state (rc/pos->xy (get-in state [:world :quaff-pos])))
-        cell-type (get cell :type)]
-    (-> state
-      (update-in [:world :player :thirst] (fn [thirst] (min 0 (- thirst 10))))
-      (rp/player-update-hp (fn [hp] (max (- hp 10) 0)))
-      (rw/assoc-current-state :normal))))
+  (-> state
+    (update-in [:world :player :thirst] (fn [thirst] (min 0 (- thirst 10))))
+    (rp/player-update-hp (fn [hp] (max (- hp 10) 0)))
+    (rw/assoc-current-state :normal)))
   ([state {x :x y :y}]
   (if-let [water (get (rw/get-cell state x y) :water)]
     (do (log/info "Drinking potable water")

      (rw/assoc-current-state :normal)))
    (do (log/info "Drinking nonpotable water")
    (-> state
      (assoc-in [:world :popover-message] "This water is not potable. Are you sure?\n \n[<color fg=\"highlight\">y</color>]es [<color fg=\"highlight\">n</color>]o")
      (assoc-in [:world :quaff-pos] (rc/xy->pos x y))
      (rw/assoc-current-state :quaff-popover))))))


        (quaff-only-adjacent-cell state)
      (and (= num-adjacent-dangerous-quaffable-cells 1)
           (zero? num-adjacent-quaffable-cells))
        (-> state
          (assoc-in [:world :popover-message] quaff-popover-message)
          (rw/assoc-current-state :quaff-popover))
      (or (> num-adjacent-quaffable-cells 1)
          (> num-adjacent-dangerous-quaffable-cells 1))
        (-> state
