Add #removeListener