Cleanup, reduce number of generated listeners