highlight cleanup