UI|Client: Cleanup