cleanup picking/highlighting