Stop highlighters persisting when the map changes to a new company

Also remove a redundant line