Removed old listeners and buttons