Cleanup unused functions; use more idiomatic clojure.walk/keywordize-keys