added removeListener on removing listeners