Cleanup for Clojure 2013/14