Removed listener class