Added eventListener removal