Continue cleanup of pmix client