Removed Listener class as thread