Some cleanup of cljs