clean-up for clientview.