Additional clean-up.
Use new collection preferences