Clean up most of the listeners, make them more efficient