Remove PSTCollectionView Dependency