Minor
Removing unused references
FIX. Update highlight under cursor if current file is valid.