Remove kramdown specific tags
Re-structure