BindContext|Client: Cleanup