Syntax Highlighter cleanup