Cleanup collection vc
More cleanup to collection vc