Removed global listener for setting global target var