Removed old listeners