diff --git a/QBImagePicker.xcodeproj/project.pbxproj b/QBImagePicker.xcodeproj/project.pbxproj
index 9508a410..9e766631 100644
--- a/QBImagePicker.xcodeproj/project.pbxproj
+++ b/QBImagePicker.xcodeproj/project.pbxproj
@@ -36,8 +36,6 @@
 		AAF1CA301ACE6E46005F6295 /* QBAssetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF1CA2E1ACE6E46005F6295 /* QBAssetsViewController.m */; };
 		AAF1CA331ACE6FB5005F6295 /* QBAssetCell.h in Headers */ = {isa = PBXBuildFile; fileRef = AAF1CA311ACE6FB5005F6295 /* QBAssetCell.h */; };
 		AAF1CA341ACE6FB5005F6295 /* QBAssetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF1CA321ACE6FB5005F6295 /* QBAssetCell.m */; };
-		AAF1CA3B1ACE765F005F6295 /* QBFooterView.h in Headers */ = {isa = PBXBuildFile; fileRef = AAF1CA391ACE765F005F6295 /* QBFooterView.h */; };
-		AAF1CA3C1ACE765F005F6295 /* QBFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF1CA3A1ACE765F005F6295 /* QBFooterView.m */; };
 		AAF1CA411ACE8B2B005F6295 /* QBImagePicker.strings in Resources */ = {isa = PBXBuildFile; fileRef = AAF1CA3F1ACE8918005F6295 /* QBImagePicker.strings */; };
 /* End PBXBuildFile section */
 
@@ -116,8 +114,6 @@
 		AAF1CA2E1ACE6E46005F6295 /* QBAssetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = QBAssetsViewController.m; sourceTree = "<group>"; };
 		AAF1CA311ACE6FB5005F6295 /* QBAssetCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QBAssetCell.h; sourceTree = "<group>"; };
 		AAF1CA321ACE6FB5005F6295 /* QBAssetCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QBAssetCell.m; sourceTree = "<group>"; };
-		AAF1CA391ACE765F005F6295 /* QBFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QBFooterView.h; sourceTree = "<group>"; };
-		AAF1CA3A1ACE765F005F6295 /* QBFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QBFooterView.m; sourceTree = "<group>"; };
 		AAF1CA3E1ACE8918005F6295 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
 		AAF1CA401ACE8A8B005F6295 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/QBImagePicker.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -163,8 +159,6 @@
 				AAF1CA191ACE5467005F6295 /* QBAlbumCell.m */,
 				AAF1CA311ACE6FB5005F6295 /* QBAssetCell.h */,
 				AAF1CA321ACE6FB5005F6295 /* QBAssetCell.m */,
-				AAF1CA391ACE765F005F6295 /* QBFooterView.h */,
-				AAF1CA3A1ACE765F005F6295 /* QBFooterView.m */,
 				AABBF08E1ACEDDFF003188A3 /* QBCheckmarkView.h */,
 				AABBF08F1ACEDDFF003188A3 /* QBCheckmarkView.m */,
 				AA3AD06D1ACF9A3A00BF523E /* QBVideoIconView.h */,
@@ -314,7 +308,6 @@
 			files = (
 				AA3AD0731ACFA06700BF523E /* QBVideoIndicatorView.h in Headers */,
 				AAF1CA331ACE6FB5005F6295 /* QBAssetCell.h in Headers */,
-				AAF1CA3B1ACE765F005F6295 /* QBFooterView.h in Headers */,
 				AAF1CA2F1ACE6E46005F6295 /* QBAssetsViewController.h in Headers */,
 				AAF1CA1A1ACE5467005F6295 /* QBAlbumCell.h in Headers */,
 				AAA8FE5B1ACDA554002A9710 /* QBAlbumsViewController.h in Headers */,
@@ -489,7 +482,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				AAF1CA341ACE6FB5005F6295 /* QBAssetCell.m in Sources */,
-				AAF1CA3C1ACE765F005F6295 /* QBFooterView.m in Sources */,
 				AA3AD0701ACF9A3A00BF523E /* QBVideoIconView.m in Sources */,
 				AABBF0911ACEDDFF003188A3 /* QBCheckmarkView.m in Sources */,
 				AAF1CA301ACE6E46005F6295 /* QBAssetsViewController.m in Sources */,
diff --git a/QBImagePicker/QBAlbumCell.m b/QBImagePicker/QBAlbumCell.m
index 909f633f..59750fab 100644
--- a/QBImagePicker/QBAlbumCell.m
+++ b/QBImagePicker/QBAlbumCell.m
@@ -8,10 +8,6 @@
 
 #import "QBAlbumCell.h"
 
-@interface QBAlbumCell ()
-
-@end
-
 @implementation QBAlbumCell
 
 - (void)setBorderWidth:(CGFloat)borderWidth
diff --git a/QBImagePicker/QBAlbumsViewController.h b/QBImagePicker/QBAlbumsViewController.h
index c1ead30b..43610b44 100644
--- a/QBImagePicker/QBAlbumsViewController.h
+++ b/QBImagePicker/QBAlbumsViewController.h
@@ -7,7 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "QBImagePickerController.h"
+
+@class QBImagePickerController;
 
 @interface QBAlbumsViewController : UITableViewController
 
diff --git a/QBImagePicker/QBAlbumsViewController.m b/QBImagePicker/QBAlbumsViewController.m
index 9a1dea40..c291acce 100644
--- a/QBImagePicker/QBAlbumsViewController.m
+++ b/QBImagePicker/QBAlbumsViewController.m
@@ -13,6 +13,7 @@
 #import "QBAlbumCell.h"
 
 // ViewControllers
+#import "QBImagePickerController.h"
 #import "QBAssetsViewController.h"
 
 static CGSize CGSizeScale(CGSize size, CGFloat scale) {
diff --git a/QBImagePicker/QBAssetsViewController.h b/QBImagePicker/QBAssetsViewController.h
index 0671be22..ac1ff742 100644
--- a/QBImagePicker/QBAssetsViewController.h
+++ b/QBImagePicker/QBAssetsViewController.h
@@ -7,9 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "QBImagePickerController.h"
 
-@class PHImageManager;
+@class QBImagePickerController;
 @class PHAssetCollection;
 
 @interface QBAssetsViewController : UICollectionViewController
diff --git a/QBImagePicker/QBAssetsViewController.m b/QBImagePicker/QBAssetsViewController.m
index dcf33212..b26ecf75 100644
--- a/QBImagePicker/QBAssetsViewController.m
+++ b/QBImagePicker/QBAssetsViewController.m
@@ -10,8 +10,8 @@
 #import <Photos/Photos.h>
 
 // Views
+#import "QBImagePickerController.h"
 #import "QBAssetCell.h"
-#import "QBFooterView.h"
 #import "QBVideoIndicatorView.h"
 
 static CGSize CGSizeScale(CGSize size, CGFloat scale) {
@@ -459,9 +459,9 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
     if (kind == UICollectionElementKindSectionFooter) {
-        QBFooterView *footerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter
-                                                                      withReuseIdentifier:@"FooterView"
-                                                                             forIndexPath:indexPath];
+        UICollectionReusableView *footerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter
+                                                                                  withReuseIdentifier:@"FooterView"
+                                                                                         forIndexPath:indexPath];
         
         // Number of assets
         UILabel *label = (UILabel *)[footerView viewWithTag:1];
diff --git a/QBImagePicker/QBFooterView.h b/QBImagePicker/QBFooterView.h
deleted file mode 100644
index 2e72a043..00000000
--- a/QBImagePicker/QBFooterView.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  QBFooterView.h
-//  QBImagePicker
-//
-//  Created by Katsuma Tanaka on 2015/04/03.
-//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface QBFooterView : UICollectionReusableView
-
-@end
diff --git a/QBImagePicker/QBFooterView.m b/QBImagePicker/QBFooterView.m
deleted file mode 100644
index b72998ab..00000000
--- a/QBImagePicker/QBFooterView.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  QBFooterView.m
-//  QBImagePicker
-//
-//  Created by Katsuma Tanaka on 2015/04/03.
-//  Copyright (c) 2015 Katsuma Tanaka. All rights reserved.
-//
-
-#import "QBFooterView.h"
-
-@implementation QBFooterView
-
-@end
diff --git a/QBImagePicker/QBImagePicker.storyboard b/QBImagePicker/QBImagePicker.storyboard
index 1ff677cf..5fbeee47 100644
--- a/QBImagePicker/QBImagePicker.storyboard
+++ b/QBImagePicker/QBImagePicker.storyboard
@@ -218,7 +218,7 @@
                                 </connections>
                             </collectionViewCell>
                         </cells>
-                        <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="FooterView" id="sqR-h3-lW1" customClass="QBFooterView">
+                        <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="FooterView" id="sqR-h3-lW1">
                             <rect key="frame" x="0.0" y="146" width="600" height="66"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>