Some cleanup of assistant attributes in preparation for caching