Got rid of all dummy listeners