More cleanup and cljs only version