Added removeListener method