Remove listener correctly