Upgrade clj-utils and major clean-up