Simplify async by removing two methods
Work on new highlighter part 1