Removed Listener field from Client