listener class cleanup