Remove debugging code
Add collapsible tags to terse