removed old listeners structure