Some cleanup of unstructured client