As usual, package tweaks, remove clojure stuff