Added a 'remove old listeners' option.