Removed highlighting features poorly implemented