remove messed up (defn