Removed redundant highlight calls