Remove highlighting, slow and buggy