         let emptyPhotos = [PhotoPickerViewModel](count:missingPhotos, repeatedValue: PhotoPickerViewModel.Empty)
         return photosAsUploadPhotos + emptyPhotos
     }
-    
-    private func stateForCurrentPhotosValue() -> ListState<PhotoPickerViewModel>{
-        if let photos = photos {
-            return ListState.Loaded(data: createPhotoArray(photos))
-        } else {
-            return ListState.Loading
-        }
-    }
+
 }
 
 private class ProfilePhotoPickerCollectionViewCell: UICollectionViewCell, ViewModelReusable {

        let reorderSupport = CollectionViewReorderSupport(
            canMoveItemAtIndexPath: { (indexPath) -> Bool in
                //Only allow moving of valid photos
                guard let _ = self.photos?[safe:indexPath.item] else { return false }
                return true
            },
            moveItemAtIndexPath: { (from, to) in
                guard let photos = self.photos else { return }
                
                //If the destination is not valid, transition back
                guard let _ = photos[safe:from.item], let _ = photos[safe:to.item] else {
                    self.photosDataSource.moveItem(fromIndexPath: to, toIndexPath: from)
                    return
                }
                
                self.photos!.moveItem(fromIndex: from.item, toIndex: to.item)
            }
        )
        
        /// Prepare the collectionViewDataSource
        photosDataSource = CollectionViewStatefulDataSource(
            state: stateForCurrentPhotosValue(),
            collectionView: self,
            reorderSupport: reorderSupport,
            mapper: { return $0 }

    
    private var photosDataSource: CollectionViewStatefulDataSource<PhotoPickerViewModel, ProfilePhotoPickerCollectionViewCell>!
    
    public private(set) var photos: [Photo]
    
    public init(photos: [Photo] = []) {
        self.photos = photos
        super.init(frame: CGRectZero, collectionViewLayout: BSWCollectionViewFlowLayout())
        
        /// Prepare the FlowLayout
        flowLayout.scrollDirection = .Vertical
