Refactor out extraneous AlbumCover collection