ClientAPI clean-up.