Remove ClientObserver and add waitClient method