diff --git a/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift b/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
index 1b317605..82cfa3de 100644
--- a/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
+++ b/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
@@ -91,12 +91,13 @@ class PickPhotosViewController: UICollectionViewController, PHPhotoLibraryChange
 
             //println("targetSize: \(targetSize)")
 
-            imageManager.requestImageForAsset(imageAsset, targetSize: targetSize, contentMode: .AspectFill, options: options) { image, info in
-                if let image = image {
-                    //println("image.size: \(image.size)")
-                    images.append(image)
+            imageManager.requestImageDataForAsset(imageAsset, options: options, resultHandler: { (data, String, imageOrientation, _) -> Void in
+                if let data = data, image = UIImage(data: data) {
+                    if let image = image.resizeToSize(targetSize, withInterpolationQuality: .Medium) {
+                        images.append(image)
+                    }
                 }
-            }
+            })
         }
 
         completion?(images: images, imageAssets: pickedImageAssets)
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index a1e7c684..fbd430ae 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -305,7 +305,7 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
                             targetSize = CGSize(width: width, height: height)
                         }
                         
-                        println("targetSize: \(targetSize)")
+                        //println("targetSize: \(targetSize)")
 
                         imageManager.requestImageDataForAsset(imageAsset, options: options, resultHandler: { (data, String, imageOrientation, _) -> Void in
                             if let data = data, image = UIImage(data: data) {
@@ -314,15 +314,6 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
                                 }
                             }
                         })
-                        
-//                        imageManager.requestImageForAsset(imageAsset, targetSize: targetSize, contentMode: .AspectFill, options: options) { image, info in
-//                            if let image = image {
-//                            //if let image = image?.resizeToSize(targetSize, withInterpolationQuality: .Medium) {
-//                                println("image.size: \(image.size), scale: \(image.scale), \(image.imageOrientation.rawValue)")
-//                                println("info: \(info)")
-//                                images.append(image)
-//                            }
-//                        }
                     }
                     
                     for (index, image) in images.enumerate() {