Removed now un-needed Listener class