Remove attrs and templating; consolidate to core.clj{s}