Clean up the use of clojure.tools
Bit ugly commit