Removes unnecessary data event and no longer use locator event.