Added removeEventListener