Add removeEventListener too