clean up after listeners on shutdown
Jeromy authored
31dc65b9