Ensure init cleanup updates client collection list.

Made cleanup_collections use get_collection_names and UseResId.