highlight multimatch comments cleanup