cleanup templates, use tal:block