Remove old listener classes