diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index f34e57ed..a7a71cde 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -7,17 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B2357AB11FA50D51003F9ACF /* FilterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */; };
-		B2357AB21FA50D51003F9ACF /* FilterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB01FA50D51003F9ACF /* FilterViewController.swift */; };
-		B2357AB31FA50E13003F9ACF /* FilterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB01FA50D51003F9ACF /* FilterViewController.swift */; };
-		B2357AB41FA50E13003F9ACF /* FilterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */; };
-		B2357AB91FA51156003F9ACF /* UIImageView+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */; };
-		B2357ABA1FA51156003F9ACF /* UIImage+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB71FA51156003F9ACF /* UIImage+Filter.m */; };
-		B2357ABB1FA5115C003F9ACF /* UIImage+Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2357AB81FA51156003F9ACF /* UIImage+Filter.h */; };
-		B2357ABC1FA5115C003F9ACF /* UIImage+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB71FA51156003F9ACF /* UIImage+Filter.m */; };
-		B2357ABD1FA5115C003F9ACF /* UIImageView+Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */; };
-		B2357ABE1FA5115C003F9ACF /* UIImageView+Filter.m in Sources */ = {isa = PBXBuildFile; fileRef = B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */; };
-		B2357ABF1FA511DC003F9ACF /* CameraViewController-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = E33BE72F1F54955E005842DC /* CameraViewController-Bridging-Header.h */; };
 		BF5861F31F613FB800B406F6 /* CropViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861F61F613FB800B406F6 /* CropViewController.xib */; };
 		BF5861F41F613FB800B406F6 /* CropViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861F61F613FB800B406F6 /* CropViewController.xib */; };
 		BF5861F81F61404C00B406F6 /* ConfirmViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5861FB1F61404C00B406F6 /* ConfirmViewController.xib */; };
@@ -85,12 +74,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterViewController.xib; sourceTree = "<group>"; };
-		B2357AB01FA50D51003F9ACF /* FilterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterViewController.swift; sourceTree = "<group>"; };
-		B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Filter.h"; sourceTree = "<group>"; };
-		B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+Filter.m"; sourceTree = "<group>"; };
-		B2357AB71FA51156003F9ACF /* UIImage+Filter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Filter.m"; sourceTree = "<group>"; };
-		B2357AB81FA51156003F9ACF /* UIImage+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Filter.h"; sourceTree = "<group>"; };
 		BF5862001F625D0F00B406F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/CameraView.strings; sourceTree = "<group>"; };
 		BF5862021F625D1200B406F6 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CameraView.strings"; sourceTree = "<group>"; };
 		C40665431C73A47C00EB9751 /* SingleImageSaver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageSaver.swift; sourceTree = "<group>"; };
@@ -174,8 +157,6 @@
 				E3669CC41F96848D00CCDD01 /* CameraViewController.xib */,
 				FA7E6B9A1B429012000E1B14 /* CropViewController.swift */,
 				BF5861F61F613FB800B406F6 /* CropViewController.xib */,
-				B2357AB01FA50D51003F9ACF /* FilterViewController.swift */,
-				B2357AAF1FA50D51003F9ACF /* FilterViewController.xib */,
 				E35A240E1F50B49A001047FD /* ConfirmViewController.swift */,
 				BF5861FB1F61404C00B406F6 /* ConfirmViewController.xib */,
 			);
@@ -199,10 +180,6 @@
 			children = (
 				E33BE71B1F5134C1005842DC /* CIImage+Utilities.m */,
 				E33BE71C1F5134C1005842DC /* CIImage+Utilities.h */,
-				B2357AB81FA51156003F9ACF /* UIImage+Filter.h */,
-				B2357AB71FA51156003F9ACF /* UIImage+Filter.m */,
-				B2357AB51FA51155003F9ACF /* UIImageView+Filter.h */,
-				B2357AB61FA51155003F9ACF /* UIImageView+Filter.m */,
 				FAB50BF01B413E8C009905B9 /* ImageFetcher.swift */,
 				C40665431C73A47C00EB9751 /* SingleImageSaver.swift */,
 				C40665471C73B72D00EB9751 /* SingleImageFetcher.swift */,
@@ -280,12 +257,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B2357ABB1FA5115C003F9ACF /* UIImage+Filter.h in Headers */,
 				E33BE7271F546920005842DC /* IRLRectangleFeature+Extensions.h in Headers */,
 				E33BE71F1F5134C1005842DC /* CIImage+Utilities.h in Headers */,
-				B2357ABF1FA511DC003F9ACF /* CameraViewController-Bridging-Header.h in Headers */,
 				E33BE72E1F5494EC005842DC /* CameraViewController.h in Headers */,
-				B2357ABD1FA5115C003F9ACF /* UIImageView+Filter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -379,7 +353,6 @@
 				E3669CC21F96848D00CCDD01 /* CameraViewController.xib in Resources */,
 				BF5861F91F61404C00B406F6 /* ConfirmViewController.xib in Resources */,
 				C482A0151CAEB1B100541D08 /* CameraViewAssets.xcassets in Resources */,
-				B2357AB41FA50E13003F9ACF /* FilterViewController.xib in Resources */,
 				BF5861F41F613FB800B406F6 /* CropViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -395,7 +368,6 @@
 				FAF0584C1B31618D008E5592 /* Images.xcassets in Resources */,
 				FA778A411B8319D8005807E7 /* image.jpg in Resources */,
 				BF5861F31F613FB800B406F6 /* CropViewController.xib in Resources */,
-				B2357AB11FA50D51003F9ACF /* FilterViewController.xib in Resources */,
 				BF5861F81F61404C00B406F6 /* ConfirmViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -418,7 +390,6 @@
 				E35A240A1F509FBD001047FD /* CGRectExtensions.swift in Sources */,
 				E33BE7291F546920005842DC /* IRLRectangleFeature+Extensions.m in Sources */,
 				C482A0081CAEB18D00541D08 /* CameraGlobals.swift in Sources */,
-				B2357ABC1FA5115C003F9ACF /* UIImage+Filter.m in Sources */,
 				C482A0091CAEB18D00541D08 /* VolumeControl.swift in Sources */,
 				C482A00A1CAEB18D00541D08 /* PhotoLibraryAuthorizer.swift in Sources */,
 				E35A24071F509CDC001047FD /* OverlayView.swift in Sources */,
@@ -426,10 +397,8 @@
 				C482A00B1CAEB18D00541D08 /* UIButtonExtensions.swift in Sources */,
 				C482A00C1CAEB18D00541D08 /* PhotoLibraryViewController.swift in Sources */,
 				C482A00D1CAEB18D00541D08 /* CameraViewController.swift in Sources */,
-				B2357AB31FA50E13003F9ACF /* FilterViewController.swift in Sources */,
 				C482A00E1CAEB18D00541D08 /* CropViewController.swift in Sources */,
 				C482A00F1CAEB18D00541D08 /* ImageCell.swift in Sources */,
-				B2357ABE1FA5115C003F9ACF /* UIImageView+Filter.m in Sources */,
 				C482A0101CAEB18D00541D08 /* PermissionsView.swift in Sources */,
 				C482A0111CAEB18D00541D08 /* CameraView.swift in Sources */,
 				C482A0121CAEB18D00541D08 /* CropOverlay.swift in Sources */,
@@ -445,12 +414,10 @@
 				E35A240F1F50B49A001047FD /* ConfirmViewController.swift in Sources */,
 				FA5FA3431B3AFA2B00497C62 /* PermissionsView.swift in Sources */,
 				FAB50BFC1B413E8C009905B9 /* ImageFetcher.swift in Sources */,
-				B2357ABA1FA51156003F9ACF /* UIImage+Filter.m in Sources */,
 				E35A24091F509FBD001047FD /* CGRectExtensions.swift in Sources */,
 				FA82313A1B3C296C00A837BE /* Utilities.swift in Sources */,
 				FAB50C001B413E8C009905B9 /* PhotoLibraryViewController.swift in Sources */,
 				E33BE7281F546920005842DC /* IRLRectangleFeature+Extensions.m in Sources */,
-				B2357AB91FA51156003F9ACF /* UIImageView+Filter.m in Sources */,
 				FAF0586A1B317894008E5592 /* CameraShot.swift in Sources */,
 				E35A240C1F509FFC001047FD /* CGPointExtensions.swift in Sources */,
 				FAF058661B316695008E5592 /* CameraViewController.swift in Sources */,
@@ -462,7 +429,6 @@
 				FAF058471B31618D008E5592 /* ViewController.swift in Sources */,
 				FAF058681B3175C5008E5592 /* CameraView.swift in Sources */,
 				C4D9BA471CA73163004F70F7 /* UIButtonExtensions.swift in Sources */,
-				B2357AB21FA50D51003F9ACF /* FilterViewController.swift in Sources */,
 				C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */,
 				FAF058451B31618D008E5592 /* AppDelegate.swift in Sources */,
 				C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */,
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Contents.json
deleted file mode 100644
index 466a19fe..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Line.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Line.pdf b/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Line.pdf
deleted file mode 100644
index 72e0398b..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/Line.imageset/Line.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json
deleted file mode 100644
index cb72ff4c..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "bwFilterHighlight.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/bwFilterHighlight.pdf b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/bwFilterHighlight.pdf
deleted file mode 100644
index c1808348..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/bwFilterHighlight.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json
deleted file mode 100644
index ee1b44a5..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "bwFilterNormal.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/bwFilterNormal.pdf b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/bwFilterNormal.pdf
deleted file mode 100644
index 3787d9df..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/bwFilterNormal.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json
deleted file mode 100644
index db990789..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "colorFilterHighlight.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/colorFilterHighlight.pdf b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/colorFilterHighlight.pdf
deleted file mode 100644
index c7086502..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/colorFilterHighlight.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json
deleted file mode 100644
index 3d9f66d1..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "colorFilterNormal.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/colorFilterNormal.pdf b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/colorFilterNormal.pdf
deleted file mode 100644
index 833ee342..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/colorFilterNormal.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json
deleted file mode 100644
index 7236b7bb..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "exposureFilterHighlight.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf b/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf
deleted file mode 100644
index f8bcb778..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json
deleted file mode 100644
index c0836b1c..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "exposureFilterNormal.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/exposureFilterNormal.pdf b/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/exposureFilterNormal.pdf
deleted file mode 100644
index f81e16cb..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/exposureFilterNormal.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json
deleted file mode 100644
index 6e430e87..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "grayFilterHighlight.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf
deleted file mode 100644
index 91c0ed1e..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json
deleted file mode 100644
index fe30d28f..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "grayFilterNormal.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/grayFilterNormal.pdf b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/grayFilterNormal.pdf
deleted file mode 100644
index 9eeda26e..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/grayFilterNormal.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json
deleted file mode 100644
index dc0cae75..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "originalFilterHighlight.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf b/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf
deleted file mode 100644
index a842f531..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf and /dev/null differ
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/Contents.json
deleted file mode 100644
index 19119a71..00000000
--- a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "originalFilterNormal.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf b/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf
deleted file mode 100644
index 247b5054..00000000
Binary files a/ALCameraViewController/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf and /dev/null differ
diff --git a/ALCameraViewController/Utilities/UIImage+Filter.h b/ALCameraViewController/Utilities/UIImage+Filter.h
deleted file mode 100755
index 0da00061..00000000
--- a/ALCameraViewController/Utilities/UIImage+Filter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  UIImage+Filter.h
-//  Updates
-//
-//  Created by Nebojsa Petrovic on 4/16/13.
-//  Copyright (c) 2013 Nebojsa Petrovic. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-typedef enum {
-    ImageFilterPresetOriginal = 0,
-    ImageFilterPresetBlackAndWhite,
-    ImageFilterPresetEnhanceColor,
-    ImageFilterPresetEnhanceExposure,
-    ImageFilterPresetGrayScale
-} ImageFilterPreset;
-
-@interface UIImage (Filter)
-
-/*
- Asynchronously applies 'filter' to the target image and
- returns the filtered image in the block.
- The target image remains unchanged.
- */
-- (void)applyFilter:(CIFilter *)filter
-         completion:(void (^)(UIImage *filteredImage))completionBlock;
-
-/*
- Returns a UIImage from the filter.
- */
-- (UIImage *)imageWithFilter:(CIFilter *)filter;
-
-/*
- Returns a UIImage from a filter preset
- */
-- (UIImage *)imageWithFilterPreset:(ImageFilterPreset)preset intensity:(float)intensity;
-
-/*
- Returns a filter using a common preset, and intensity value, ranging from 0 to 1
- */
-- (CIFilter *)filterWithPreset:(ImageFilterPreset)preset;
-- (CIFilter *)filterWithPreset:(ImageFilterPreset)preset intensity:(float)intensity;
-
-@end
diff --git a/ALCameraViewController/Utilities/UIImage+Filter.m b/ALCameraViewController/Utilities/UIImage+Filter.m
deleted file mode 100755
index 094fe45f..00000000
--- a/ALCameraViewController/Utilities/UIImage+Filter.m
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-//  UIImage+Filter.m
-//  Updates
-//
-//  Created by Nebojsa Petrovic on 4/16/13.
-//  Copyright (c) 2013 Nebojsa Petrovic. All rights reserved.
-//
-
-#import "UIImage+Filter.h"
-
-@interface ValueRange : NSObject
-
-@property(nonatomic) float low;
-@property(nonatomic) float high;
-
-- (id)initWithLow:(float)low high:(float)high;
-- (NSNumber*)valueWithIntensity:(float)intensity;
-+ (id)valueWithLow:(float)low high:(float)high;
-
-@end
-
-
-@implementation ValueRange
-
-+ (id)valueWithLow:(float)low high:(float)high {
-  return [[self alloc] initWithLow:low high:high];
-}
-
-- (id)initWithLow:(float)low high:(float)high {
-  if ( self = [super init] ) {
-    self.low = low;
-    self.high = high;
-  }
-  
-  return self;
-}
-
-- (NSNumber*)valueWithIntensity:(float)intensity {
-  return [NSNumber numberWithFloat:self.low + (self.high-self.low)*intensity];
-}
-@end
-
-
-@implementation UIImage (Filter)
-
-- (void)applyFilter:(CIFilter *)filter
-         completion:(void (^)(UIImage *filteredImage))completionBlock {
-  
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    CIContext *context = [CIContext contextWithOptions:nil];
-    CIImage *outputImage = filter.outputImage;
-    CGImageRef cgimg = [context createCGImage:outputImage fromRect:[outputImage extent]];
-    UIImage *newImg = [UIImage imageWithCGImage:cgimg];
-    CGImageRelease(cgimg);
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-      completionBlock(newImg);
-    });
-  });
-  
-}
-
-- (UIImage *)imageWithFilter:(CIFilter *)filter {
-  CIContext *context = [CIContext contextWithOptions:nil];
-  CIImage *outputImage = filter.outputImage;
-  CGImageRef cgimg = [context createCGImage:outputImage fromRect:[outputImage extent]];
-  UIImage *newImg = [UIImage imageWithCGImage:cgimg];
-  CGImageRelease(cgimg);
-  return newImg;
-}
-
-- (UIImage *)imageWithFilterPreset:(ImageFilterPreset)preset {
-  return [self imageWithFilterPreset:preset intensity:0.3];
-}
-
-- (UIImage *)imageWithFilterPreset:(ImageFilterPreset)preset intensity:(float)intensity{
-  if (preset == ImageFilterPresetOriginal) {
-    return self;
-  }
-  
-  return [self imageWithFilter:[self filterWithPreset:preset intensity:intensity]];
-}
-
-- (CIFilter *)filterWithPreset:(ImageFilterPreset)preset {
-  return [self filterWithPreset:preset intensity:0.3];
-}
-
-- (CIFilter *)filterWithPreset:(ImageFilterPreset)preset intensity:(float)intensity {
-  CIImage *image = [CIImage imageWithCGImage:self.CGImage];
-  CIFilter *filter = nil;
-  
-  switch (preset) {
-    case ImageFilterPresetBlackAndWhite: {
-      CIFilter* colorControl = [CIFilter filterWithName:@"CIColorControls"
-                                          keysAndValues:kCIInputImageKey, image, nil];
-      [self setValueForPreset:preset filter:colorControl intensity:intensity];
-
-      
-      CIFilter* sharpMask = [CIFilter filterWithName:@"CIUnsharpMask"
-                                       keysAndValues:kCIInputImageKey, colorControl.outputImage, nil];
-      [self setValueForPreset:preset filter:sharpMask intensity:intensity];
-
-      filter = [CIFilter filterWithName:@"CIExposureAdjust"
-                          keysAndValues:kCIInputImageKey, sharpMask.outputImage, nil];
-      [self setValueForPreset:preset filter:filter intensity:intensity];
-
-    }
-      break;
-    case ImageFilterPresetGrayScale: {
-      CIFilter* unsharpMask = [CIFilter filterWithName:@"CIUnsharpMask"
-                                         keysAndValues:kCIInputImageKey, image, nil];
-      [self setValueForPreset:preset filter:unsharpMask intensity:intensity];
-      
-      filter = [CIFilter filterWithName:@"CIColorControls"
-                          keysAndValues:kCIInputImageKey, unsharpMask.outputImage, nil];
-      [self setValueForPreset:preset filter:filter intensity:intensity];
-
-
-    }
-      break;
-    case ImageFilterPresetEnhanceColor: {
-      CIFilter* colorControl = [CIFilter filterWithName:@"CIColorControls"
-                                         keysAndValues:kCIInputImageKey, image, nil];
-      [self setValueForPreset:preset filter:colorControl intensity:intensity];
-
-      
-      filter = [CIFilter filterWithName:@"CIUnsharpMask"
-                          keysAndValues:kCIInputImageKey, colorControl.outputImage, nil];
-      [self setValueForPreset:preset filter:filter intensity:intensity];
-      
-    }
-      break;
-    case ImageFilterPresetEnhanceExposure: {
-      CIFilter* exposure = [CIFilter filterWithName:@"CIExposureAdjust"
-                                          keysAndValues:kCIInputImageKey, image, nil];
-      [self setValueForPreset:preset filter:exposure intensity:intensity];
-      
-      CIFilter* gamma = [CIFilter filterWithName:@"CIGammaAdjust"
-                                       keysAndValues:kCIInputImageKey, exposure.outputImage, nil];
-      [self setValueForPreset:preset filter:gamma intensity:intensity];
-
-      
-      
-      CIFilter* noiseReduction = [CIFilter filterWithName:@"CINoiseReduction"
-                                            keysAndValues:kCIInputImageKey, gamma.outputImage, nil];
-      [self setValueForPreset:preset filter:noiseReduction intensity:intensity];
-
-      
-      filter = [CIFilter filterWithName:@"CIColorControls"
-                          keysAndValues:kCIInputImageKey, noiseReduction.outputImage, nil];
-      [self setValueForPreset:preset filter:filter intensity:intensity];
-
-    }
-      break;
-    default:
-      break;
-  }
-  
-  return filter;
-}
-
-+(NSDictionary*)presetParameters {
-  static NSDictionary *inst = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    inst = @{
-             @(ImageFilterPresetEnhanceExposure): @{ @"CIExposureAdjust" : @{
-                                                         @"inputEV": [ValueRange valueWithLow:0 high:5]
-                                                         },
-                                                     @"CIGammaAdjust": @{
-                                                         @"inputPower": [ValueRange valueWithLow:1 high:0.7]
-                                                         } ,
-                                                     @"CINoiseReduction": @{
-                                                         @"inputNoiseLevel": [ValueRange valueWithLow:0 high:0.01],
-                                                         @"inputSharpness": [ValueRange valueWithLow:0.3 high:1.1]
-                                                         },
-                                                     @"CIColorControls":  @{
-                                                         @"inputSaturation": [ValueRange valueWithLow:1 high:1],
-                                                         @"inputBrightness": [ValueRange valueWithLow:0 high:0],
-                                                         @"inputContrast": [ValueRange valueWithLow:1 high:1.3]
-                                                         }
-                                                     },
-             @(ImageFilterPresetEnhanceColor): @{ @"CIColorControls" : @{
-                                                      @"inputSaturation": [ValueRange valueWithLow:1 high:1.9],
-                                                      @"inputBrightness": [ValueRange valueWithLow:0 high:0.1],
-                                                      @"inputContrast": [ValueRange valueWithLow:1 high:1.2]
-                                                      },
-                                                  @"CIUnsharpMask": @{
-                                                      @"inputRadius": [ValueRange valueWithLow:0 high:2.5],
-                                                      @"inputIntensity": [ValueRange valueWithLow:0 high:0.5]
-                                                      }
-                                                  },
-             @(ImageFilterPresetGrayScale): @{ @"CIColorControls" : @{
-                                                   @"inputSaturation": [ValueRange valueWithLow:1 high:0],
-                                                   @"inputBrightness": [ValueRange valueWithLow:0 high:0],
-                                                   @"inputContrast": [ValueRange valueWithLow:1 high:1]
-                                                   },
-                                               @"CIUnsharpMask": @{
-                                                   @"inputRadius": [ValueRange valueWithLow:0 high:2.5],
-                                                   @"inputIntensity": [ValueRange valueWithLow:0 high:0.15]
-                                                   }
-                                               },
-             @(ImageFilterPresetBlackAndWhite): @{ @"CIExposureAdjust" : @{
-                                                       @"inputEV": [ValueRange valueWithLow:0 high:2.3]
-                                                       },
-                                                   @"CIUnsharpMask" : @{
-                                                       @"inputRadius": [ValueRange valueWithLow:0 high:75.0],
-                                                       @"inputIntensity": [ValueRange valueWithLow:0 high:2.0]
-                                                       },
-                                                   @"CIColorControls":  @{
-                                                       @"inputSaturation": [ValueRange valueWithLow:1 high:0],
-                                                       @"inputBrightness": [ValueRange valueWithLow:0 high:0.15],
-                                                       @"inputContrast": [ValueRange valueWithLow:1 high:1.3]
-                                                       }
-                                                   }
-             };
-  });
-  return inst;
-}
-
--(void)setValueForPreset:(ImageFilterPreset)preset filter:(CIFilter*)filter intensity:(float)intensity{
-  NSDictionary* presetDict =  [[[self class] presetParameters] objectForKey:@(preset)];
-  
-  NSDictionary *subDict = presetDict[[filter name]];
-
-  for (NSString* key in [subDict allKeys]) {
-    ValueRange *value = subDict[key];
-    [filter setValue:[value valueWithIntensity:intensity] forKey:key];
-  }
-  
-}
-
-@end
-
-
-
-
-
-
-
-
diff --git a/ALCameraViewController/Utilities/UIImageView+Filter.h b/ALCameraViewController/Utilities/UIImageView+Filter.h
deleted file mode 100755
index ec34f46a..00000000
--- a/ALCameraViewController/Utilities/UIImageView+Filter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  UIImageView+Filter.h
-//  Updates
-//
-//  Created by Nebojsa Petrovic on 4/14/13.
-//  Copyright (c) 2013 Nebojsa Petrovic. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "UIImage+Filter.h"
-
-@interface UIImageView (Filter)
-
-/*
- Apply 'filter' to the image view's image.
- The filter application can be animated with custom duration
- and options.  
- When the filter has finished being applied, the completionBlock is called.
- */
-- (void)applyFilter:(CIFilter *)filter
-  animationDuration:(NSTimeInterval)animationDuration
-   animationOptions:(UIViewAnimationOptions)animationOptions
-         completion:(void (^)(void))completionBlock;
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-            animationDuration:(NSTimeInterval)animationDuration
-             animationOptions:(UIViewAnimationOptions)animationOptions
-                   completion:(void (^)(void))completionBlock;
-
-/*
- Apply 'filter' to the image view's image.
- If 'animated' is YES, the filter application is animated
- with a cross-disolve effect for a duration of 0.3 seconds.
- When the filter has finished being applied, the completionBlock is called.
- */
-- (void)applyFilter:(CIFilter *)filter
-           animated:(BOOL)animated
-         completion:(void (^)(void))completionBlock;
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-                     animated:(BOOL)animated
-                   completion:(void (^)(void))completionBlock;
-
-/*
- Apply 'filter' to the image view's image without animation.
- When the filter has finished being applied, the completionBlock is called.
- */
-- (void)applyFilter:(CIFilter *)filter
-         completion:(void (^)(void))completionBlock;
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-                   completion:(void (^)(void))completionBlock;
-
-/*
- Apply 'filter' to the image view's image without animation.
- */
-- (void)applyFilter:(CIFilter *)filter;
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset intensity:(float)intensity;
-
-/*
- Remove any filters applied.  This bring back the original image.
- */
-- (void)removeFilter;
-
-@end
diff --git a/ALCameraViewController/Utilities/UIImageView+Filter.m b/ALCameraViewController/Utilities/UIImageView+Filter.m
deleted file mode 100755
index 6c8655cb..00000000
--- a/ALCameraViewController/Utilities/UIImageView+Filter.m
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-//  UIImageView+Filter.m
-//  Updates
-//
-//  Created by Nebojsa Petrovic on 4/14/13.
-//  Copyright (c) 2013 Nebojsa Petrovic. All rights reserved.
-//
-
-#import "UIImageView+Filter.h"
-#import <CoreImage/CoreImage.h>
-
-// Arbitrary tag so that we can identify filtered images.
-// Otherwise we risk removing a custom subview that isn't a filter.
-#define IMAGE_FILTER_TAG 123454321
-
-@implementation UIImageView (Filter)
-
-- (void)applyFilter:(CIFilter *)filter
-  animationDuration:(NSTimeInterval)animationDuration
-    animationOptions:(UIViewAnimationOptions)animationOptions
-         completion:(void (^)(void))completionBlock {
-
-    [self.image applyFilter:filter completion:^(UIImage *filteredImage) {
-        // Remove any previous filters
-        [self removeFilter];
-
-        // Add the filtered image on top of the original image.
-        UIImageView *filteredImageView = [[UIImageView alloc] initWithFrame:self.bounds];
-        filteredImageView.tag = IMAGE_FILTER_TAG;
-        filteredImageView.contentMode = self.contentMode;
-        [self addSubview:filteredImageView];
-
-        // No animation
-        if (animationDuration == 0.0f) {
-            filteredImageView.image = filteredImage;
-            if (completionBlock) {
-                completionBlock();
-            }
-            return;
-        }
-
-        // Animation
-        [UIView transitionWithView:self
-                          duration:animationDuration
-                           options:animationOptions
-                        animations:^{
-                            filteredImageView.image = filteredImage;
-                        } completion:^(BOOL finished) {     
-                            if (completionBlock) {
-                                completionBlock();
-                            }
-                        }];
-    }];
-}
-
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-            animationDuration:(NSTimeInterval)animationDuration
-             animationOptions:(UIViewAnimationOptions)animationOptions
-                   completion:(void (^)(void))completionBlock {
-    CIFilter *filter = [self.image filterWithPreset:preset];
-    [self applyFilter:filter
-    animationDuration:animationDuration
-     animationOptions:animationOptions
-           completion:completionBlock];
-}
-
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-            animationDuration:(NSTimeInterval)animationDuration
-             animationOptions:(UIViewAnimationOptions)animationOptions
-                   completion:(void (^)(void))completionBlock {
-  CIFilter *filter = [self.image filterWithPreset:preset intensity:intensity];
-  [self applyFilter:filter
-  animationDuration:animationDuration
-   animationOptions:animationOptions
-         completion:completionBlock];
-}
-
-- (void)applyFilter:(CIFilter *)filter
-           animated:(BOOL)animated
-         completion:(void (^)(void))completionBlock {
-    [self applyFilter:filter
-    animationDuration:animated ? 0.3f : 0.0f
-     animationOptions:UIViewAnimationOptionTransitionCrossDissolve
-           completion:completionBlock];
-}
-
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-                     animated:(BOOL)animated
-                   completion:(void (^)(void))completionBlock {
-    CIFilter *filter = [self.image filterWithPreset:preset intensity:intensity];
-    [self applyFilter:filter
-             animated:animated
-           completion:completionBlock];
-}
-
-- (void)applyFilter:(CIFilter *)filter
-         completion:(void (^)(void))completionBlock {
-    [self applyFilter:filter animated:NO completion:completionBlock];
-}
-
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset
-                    intensity:(float)intensity
-                   completion:(void (^)(void))completionBlock {
-    CIFilter *filter = [self.image filterWithPreset:preset intensity:intensity];
-    [self applyFilter:filter
-           completion:completionBlock];
-}
-
-- (void)applyFilter:(CIFilter *)filter {
-    [self applyFilter:filter completion:nil];
-}
-
-- (void)applyFilterWithPreset:(ImageFilterPreset)preset intensity:(float)intensity{
-    CIFilter *filter = [self.image filterWithPreset:preset intensity:intensity];
-    [self applyFilter:filter];
-}
-
-- (void)removeFilter {
-    for (UIView *subview in self.subviews) {
-        if ([subview isKindOfClass:[UIImageView class]] &&
-            subview.tag == IMAGE_FILTER_TAG) {
-            [subview removeFromSuperview];
-        }
-    }
-}
-
-@end
diff --git a/ALCameraViewController/ViewController/CropViewController.swift b/ALCameraViewController/ViewController/CropViewController.swift
index 57c0dbb8..0b3855ff 100644
--- a/ALCameraViewController/ViewController/CropViewController.swift
+++ b/ALCameraViewController/ViewController/CropViewController.swift
@@ -395,9 +395,17 @@ public class CropViewController: UIViewController, UIScrollViewDelegate {
 	
   private func startConfimController(uiImage: UIImage) {
     
-    let filterController = FilterViewController(uiImage, asset)
-    filterController.onComplete = onComplete
-    self.navigationController?.pushViewController(filterController, animated: false)
+    let confirmController = ConfirmViewController(uiImage, asset)
+    confirmController.onComplete = { [weak self] image, asset in
+      guard let image = image else {
+        return
+      }
+      
+      self?.onComplete?(image, asset)
+      self?.onComplete = nil
+    }
+    
+    self.navigationController?.pushViewController(confirmController, animated: false)
   }
 
 }
diff --git a/ALCameraViewController/ViewController/FilterViewController.swift b/ALCameraViewController/ViewController/FilterViewController.swift
deleted file mode 100644
index 3c573911..00000000
--- a/ALCameraViewController/ViewController/FilterViewController.swift
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-//  FilterViewController.swift
-//  ALCameraViewController
-//
-//  Created by Narek Simonyan on 10/28/17.
-//  Copyright © 2017 zero. All rights reserved.
-//
-
-import UIKit
-import Photos
-
-class FilterViewController: UIViewController {
-
-    @IBOutlet var filterView: UIView!
-        
-    @IBOutlet var doneButton: UIButton!
-    @IBOutlet var backButton: UIButton!
-    @IBOutlet var imageView: UIImageView!
-    @IBOutlet var grayFilter: UIButton!
-    @IBOutlet var colorFilter: UIButton!
-    @IBOutlet var exposureFilter: UIButton!
-    @IBOutlet var bwFilter: UIButton!
-    @IBOutlet var filterIntensitySlider: UISlider!
-    
-    let image: UIImage?
-    let asset: PHAsset?
-    
-    var filterType:ImageFilterPreset? {
-        didSet {
-            apply()
-        }
-    }
-    var filterIntensity: Float = 0.3 {
-        didSet {
-            apply()
-        }
-    }
-    
-    public var onComplete: CameraViewCompletion?
-
-    public override var prefersStatusBarHidden: Bool {
-        return true
-    }
-    
-    public override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
-        return UIStatusBarAnimation.slide
-    }
-    
-    open override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return .portrait
-    }
-    
-    public init(_ image: UIImage?, _ asset: PHAsset?) {
-        self.image = image
-        self.asset = asset
-        super.init(nibName: "FilterViewController", bundle: CameraGlobals.shared.bundle)
-    }
-    
-    public required init?(coder aDecoder: NSCoder) {
-        image = nil
-        asset = nil
-        super.init(coder: aDecoder)
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        imageView.image = image
-        
-        setupButtonActions()
-    }
-    
-    internal func setupButtonActions() {
-        
-        backButton.action = {[weak self] in self?.navigationController?.popViewController(animated: false)}
-        doneButton.action = { [weak self] in self?.confirmPhoto() }
-        grayFilter.action = { [weak self] in
-            guard let strongSelf = self else {return}
-            strongSelf.applyFilter(sender: strongSelf.grayFilter)
-        }
-        colorFilter.action = { [weak self] in
-            guard let strongSelf = self else {return}
-            strongSelf.applyFilter(sender: strongSelf.colorFilter)}
-        exposureFilter.action = { [weak self] in
-            guard let strongSelf = self else {return}
-            strongSelf.applyFilter(sender: strongSelf.exposureFilter)
-        }
-        bwFilter.action = { [weak self] in
-            guard let strongSelf = self else {return}
-            strongSelf.applyFilter(sender: strongSelf.bwFilter)
-        }
-    }
-    
-    internal func confirmPhoto() {
-        
-        guard let image = imageView.image else {
-            return
-        }
-        let confirmController = ConfirmViewController(image, asset)
-        
-        confirmController.onComplete = { [weak self] image, asset in
-          guard let image = image else {
-            return
-          }
-    
-          self?.onComplete?(image, asset)
-          self?.onComplete = nil
-        }
-    
-        self.navigationController?.pushViewController(confirmController, animated: false)
-    }
-    
-    internal func applyFilter (sender: UIButton) {
-        
-        let dictionary = [grayFilter:ImageFilterPresetGrayScale,
-                          bwFilter:ImageFilterPresetBlackAndWhite,
-                          exposureFilter:ImageFilterPresetEnhanceExposure,
-                          colorFilter:ImageFilterPresetEnhanceColor]
-        
-        guard let filter = dictionary[sender] else {
-            return
-        }
-        
-        _ = [grayFilter,colorFilter,exposureFilter,bwFilter].map({$0?.isSelected = false})
-        sender.isSelected = true
-        filterType = filter
-    }
-    
-    internal func apply() {
-        
-        guard let filterType = filterType, let filter = imageView.image?.filter(with: filterType, intensity: filterIntensity) else {
-            return
-        }
-        imageView.image?.apply(filter, completion: { (image) in
-            DispatchQueue.main.async { [weak self] in
-                self?.imageView.image = image
-            }
-        })
-    }
-    
-    @IBAction func filterIntensityChanged(_ sender: UISlider) {
-        filterIntensity = sender.value
-    }
-}
diff --git a/ALCameraViewController/ViewController/FilterViewController.xib b/ALCameraViewController/ViewController/FilterViewController.xib
deleted file mode 100644
index fc92acbb..00000000
--- a/ALCameraViewController/ViewController/FilterViewController.xib
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FilterViewController" customModule="ALCameraViewController" customModuleProvider="target">
-            <connections>
-                <outlet property="backButton" destination="Vnw-H5-kLw" id="Vei-fP-Jdp"/>
-                <outlet property="bwFilter" destination="WxR-kU-W2F" id="YTM-O0-WxU"/>
-                <outlet property="colorFilter" destination="qjb-gN-mCj" id="oeo-gN-BP8"/>
-                <outlet property="doneButton" destination="UXb-Jv-ca1" id="CI6-QJ-gNP"/>
-                <outlet property="exposureFilter" destination="DSB-op-q64" id="oRE-zj-qh2"/>
-                <outlet property="filterIntensitySlider" destination="lQ1-od-vPR" id="0Sh-yd-H6i"/>
-                <outlet property="filterView" destination="Usl-eK-CMT" id="5qw-0b-HLA"/>
-                <outlet property="grayFilter" destination="8DC-rr-gPa" id="fQ2-0N-AOy"/>
-                <outlet property="imageView" destination="IZE-ts-G1g" id="krM-u6-zKD"/>
-                <outlet property="view" destination="gkh-Q1-bKG" id="meY-JE-Iai"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="gkh-Q1-bKG">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Usl-eK-CMT">
-                    <rect key="frame" x="0.0" y="495" width="375" height="128"/>
-                    <subviews>
-                        <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.30000001192092896" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="lQ1-od-vPR">
-                            <rect key="frame" x="6" y="16" width="363" height="19"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="18" id="0Ia-kQ-rzE"/>
-                            </constraints>
-                            <connections>
-                                <action selector="filterIntensityChanged:" destination="-1" eventType="valueChanged" id="xc1-yi-SEH"/>
-                            </connections>
-                        </slider>
-                        <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="8K5-61-kM8">
-                            <rect key="frame" x="8" y="50" width="359" height="70"/>
-                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6M2-8R-mtl" userLabel="Color+ Filter">
-                                    <rect key="frame" x="0.0" y="0.0" width="60" height="70"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qjb-gN-mCj">
-                                            <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="60" id="Ft8-Zb-LYn"/>
-                                                <constraint firstAttribute="width" constant="60" id="MYa-I1-SYn"/>
-                                            </constraints>
-                                            <state key="normal" image="colorFilterNormal"/>
-                                            <state key="selected" image="colorFilterHighlight"/>
-                                            <state key="highlighted" image="colorFilterHighlight"/>
-                                        </button>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Color+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MFt-9T-uYL">
-                                            <rect key="frame" x="12.5" y="56.5" width="35" height="13.5"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="0.55000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstItem="MFt-9T-uYL" firstAttribute="centerX" secondItem="6M2-8R-mtl" secondAttribute="centerX" id="8yW-us-nNW"/>
-                                        <constraint firstAttribute="width" constant="60" id="IlM-As-kIK"/>
-                                        <constraint firstAttribute="bottom" secondItem="MFt-9T-uYL" secondAttribute="bottom" id="i6x-MA-Bco"/>
-                                        <constraint firstItem="qjb-gN-mCj" firstAttribute="centerX" secondItem="6M2-8R-mtl" secondAttribute="centerX" id="ueZ-cn-OOP"/>
-                                        <constraint firstItem="qjb-gN-mCj" firstAttribute="top" secondItem="6M2-8R-mtl" secondAttribute="top" id="xjT-KI-Q1N"/>
-                                    </constraints>
-                                </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f5X-Ty-1bS" userLabel="Exposure+ Filter">
-                                    <rect key="frame" x="99.5" y="0.0" width="60" height="70"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DSB-op-q64">
-                                            <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="60" id="6q7-qW-hcO"/>
-                                                <constraint firstAttribute="height" constant="60" id="wVc-xi-QG8"/>
-                                            </constraints>
-                                            <state key="normal" image="exposureFilterNormal"/>
-                                            <state key="selected" image="exposureFilterHighlight"/>
-                                            <state key="highlighted" image="exposureFilterHighlight"/>
-                                        </button>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Exposure+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wfe-V4-yfh">
-                                            <rect key="frame" x="2" y="56.5" width="56" height="13.5"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="0.55000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstItem="Wfe-V4-yfh" firstAttribute="centerX" secondItem="f5X-Ty-1bS" secondAttribute="centerX" id="26E-8X-l2L"/>
-                                        <constraint firstAttribute="width" constant="60" id="61g-My-xTX"/>
-                                        <constraint firstItem="DSB-op-q64" firstAttribute="top" secondItem="f5X-Ty-1bS" secondAttribute="top" id="Pvc-CZ-stT"/>
-                                        <constraint firstAttribute="bottom" secondItem="Wfe-V4-yfh" secondAttribute="bottom" id="R2z-TM-Gss"/>
-                                        <constraint firstItem="DSB-op-q64" firstAttribute="centerX" secondItem="f5X-Ty-1bS" secondAttribute="centerX" id="R8d-V2-6Cj"/>
-                                    </constraints>
-                                </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9kG-Md-eO9" userLabel="B&amp;W Filter">
-                                    <rect key="frame" x="199.5" y="0.0" width="60" height="70"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WxR-kU-W2F">
-                                            <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="60" id="AYh-Kj-PO9"/>
-                                                <constraint firstAttribute="width" constant="60" id="y8i-qd-yHZ"/>
-                                            </constraints>
-                                            <state key="normal" image="bwFilterNormal"/>
-                                            <state key="selected" image="bwFilterHighlight"/>
-                                            <state key="highlighted" image="bwFilterHighlight"/>
-                                        </button>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="B&amp;W" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p3W-3n-9Jn">
-                                            <rect key="frame" x="17.5" y="56.5" width="25.5" height="13.5"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="0.55000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstAttribute="bottom" secondItem="p3W-3n-9Jn" secondAttribute="bottom" id="1lg-U6-ZhF"/>
-                                        <constraint firstItem="p3W-3n-9Jn" firstAttribute="centerX" secondItem="9kG-Md-eO9" secondAttribute="centerX" id="2ow-aV-55F"/>
-                                        <constraint firstAttribute="width" constant="60" id="K4K-ed-Hv6"/>
-                                        <constraint firstItem="WxR-kU-W2F" firstAttribute="top" secondItem="9kG-Md-eO9" secondAttribute="top" id="fdA-CS-vO0"/>
-                                        <constraint firstItem="WxR-kU-W2F" firstAttribute="centerX" secondItem="9kG-Md-eO9" secondAttribute="centerX" id="v5Q-JR-sOS"/>
-                                    </constraints>
-                                </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6SX-jg-tfj" userLabel="Gray Scale Filter">
-                                    <rect key="frame" x="299" y="0.0" width="60" height="70"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8DC-rr-gPa">
-                                            <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="60" id="9fb-no-uc0"/>
-                                                <constraint firstAttribute="height" constant="60" id="dzn-fT-phz"/>
-                                            </constraints>
-                                            <state key="normal" image="grayFilterNormal"/>
-                                            <state key="selected" image="grayFilterHighlight"/>
-                                            <state key="highlighted" image="grayFilterHighlight"/>
-                                        </button>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gray Scale" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jXA-bf-oh0">
-                                            <rect key="frame" x="1.5" y="56.5" width="56.5" height="13.5"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="0.55000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstItem="8DC-rr-gPa" firstAttribute="top" secondItem="6SX-jg-tfj" secondAttribute="top" id="7cx-1W-cOz"/>
-                                        <constraint firstItem="jXA-bf-oh0" firstAttribute="centerX" secondItem="6SX-jg-tfj" secondAttribute="centerX" id="BwH-NK-APz"/>
-                                        <constraint firstItem="8DC-rr-gPa" firstAttribute="centerX" secondItem="6SX-jg-tfj" secondAttribute="centerX" id="CPF-XZ-KrL"/>
-                                        <constraint firstAttribute="bottom" secondItem="jXA-bf-oh0" secondAttribute="bottom" id="QDz-pX-l4r"/>
-                                        <constraint firstAttribute="width" constant="60" id="afd-t0-du9"/>
-                                    </constraints>
-                                </view>
-                            </subviews>
-                        </stackView>
-                    </subviews>
-                    <color key="backgroundColor" red="0.18039215689999999" green="0.20392156859999999" blue="0.23921568630000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstItem="8K5-61-kM8" firstAttribute="top" secondItem="lQ1-od-vPR" secondAttribute="bottom" constant="16" id="4Aq-sm-ZQN"/>
-                        <constraint firstAttribute="height" constant="128" id="8R5-J1-QrP"/>
-                        <constraint firstItem="lQ1-od-vPR" firstAttribute="leading" secondItem="Usl-eK-CMT" secondAttribute="leading" constant="8" id="9V0-OY-Gew"/>
-                        <constraint firstAttribute="trailing" secondItem="lQ1-od-vPR" secondAttribute="trailing" constant="8" id="P6j-0F-Ngq"/>
-                        <constraint firstAttribute="bottom" secondItem="8K5-61-kM8" secondAttribute="bottom" constant="8" id="Z2d-Uw-Ghc"/>
-                        <constraint firstItem="8K5-61-kM8" firstAttribute="leading" secondItem="Usl-eK-CMT" secondAttribute="leading" constant="8" id="bdq-EG-Onv"/>
-                        <constraint firstItem="lQ1-od-vPR" firstAttribute="top" secondItem="Usl-eK-CMT" secondAttribute="top" constant="16" id="ioD-l0-5QS"/>
-                        <constraint firstAttribute="trailing" secondItem="8K5-61-kM8" secondAttribute="trailing" constant="8" id="mBG-bb-PPY"/>
-                    </constraints>
-                </view>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IZE-ts-G1g">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="495"/>
-                </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="V3l-Vh-V5I">
-                    <rect key="frame" x="0.0" y="623" width="375" height="44"/>
-                    <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vnw-H5-kLw">
-                            <rect key="frame" x="10" y="5.5" width="33" height="33"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="33" id="ReT-CE-hLw"/>
-                                <constraint firstAttribute="width" constant="33" id="riO-Ii-XFu"/>
-                            </constraints>
-                            <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <state key="normal" image="Line"/>
-                        </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UXb-Jv-ca1">
-                            <rect key="frame" x="322" y="5.5" width="43" height="33"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="33" id="xJd-1j-Wx1"/>
-                            </constraints>
-                            <state key="normal" title="Done"/>
-                        </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Filter" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bc2-bp-8hg">
-                            <rect key="frame" x="168.5" y="12" width="38.5" height="20.5"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstItem="Bc2-bp-8hg" firstAttribute="centerX" secondItem="V3l-Vh-V5I" secondAttribute="centerX" id="0dN-fm-zYc"/>
-                        <constraint firstItem="Vnw-H5-kLw" firstAttribute="centerY" secondItem="V3l-Vh-V5I" secondAttribute="centerY" id="2Lb-U6-xFJ"/>
-                        <constraint firstItem="UXb-Jv-ca1" firstAttribute="centerY" secondItem="V3l-Vh-V5I" secondAttribute="centerY" id="Ff1-Bn-N7i"/>
-                        <constraint firstAttribute="trailing" secondItem="UXb-Jv-ca1" secondAttribute="trailing" constant="10" id="KbZ-1a-qL7"/>
-                        <constraint firstAttribute="height" constant="44" id="O6g-cP-jXZ"/>
-                        <constraint firstItem="Bc2-bp-8hg" firstAttribute="centerY" secondItem="V3l-Vh-V5I" secondAttribute="centerY" id="RbG-f6-PE6"/>
-                        <constraint firstItem="Vnw-H5-kLw" firstAttribute="leading" secondItem="V3l-Vh-V5I" secondAttribute="leading" constant="10" id="Zxl-un-zvY"/>
-                    </constraints>
-                </view>
-            </subviews>
-            <color key="backgroundColor" red="0.1803921568627451" green="0.20392156862745098" blue="0.23921568627450979" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstAttribute="trailing" secondItem="V3l-Vh-V5I" secondAttribute="trailing" id="6Ef-9t-8qs"/>
-                <constraint firstAttribute="trailing" secondItem="Usl-eK-CMT" secondAttribute="trailing" id="DWx-8P-4ky"/>
-                <constraint firstItem="V3l-Vh-V5I" firstAttribute="leading" secondItem="gkh-Q1-bKG" secondAttribute="leading" id="V7x-Vy-5CS"/>
-                <constraint firstItem="IZE-ts-G1g" firstAttribute="top" secondItem="gkh-Q1-bKG" secondAttribute="top" id="W93-73-gKq"/>
-                <constraint firstItem="V3l-Vh-V5I" firstAttribute="top" secondItem="Usl-eK-CMT" secondAttribute="bottom" id="WNe-J0-xtO"/>
-                <constraint firstAttribute="bottom" secondItem="V3l-Vh-V5I" secondAttribute="bottom" id="a65-6T-cG8"/>
-                <constraint firstItem="Usl-eK-CMT" firstAttribute="leading" secondItem="gkh-Q1-bKG" secondAttribute="leading" id="aZw-Wp-E5j"/>
-                <constraint firstItem="IZE-ts-G1g" firstAttribute="leading" secondItem="gkh-Q1-bKG" secondAttribute="leading" id="fzp-fC-E56"/>
-                <constraint firstAttribute="trailing" secondItem="IZE-ts-G1g" secondAttribute="trailing" id="hwZ-Iv-yk0"/>
-                <constraint firstItem="Usl-eK-CMT" firstAttribute="top" secondItem="IZE-ts-G1g" secondAttribute="bottom" id="pjn-ya-yQU"/>
-            </constraints>
-            <point key="canvasLocation" x="-220" y="-95"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="Line" width="14" height="23"/>
-        <image name="bwFilterHighlight" width="52" height="52"/>
-        <image name="bwFilterNormal" width="52" height="52"/>
-        <image name="colorFilterHighlight" width="52" height="52"/>
-        <image name="colorFilterNormal" width="52" height="52"/>
-        <image name="exposureFilterHighlight" width="52" height="52"/>
-        <image name="exposureFilterNormal" width="52" height="52"/>
-        <image name="grayFilterHighlight" width="52" height="52"/>
-        <image name="grayFilterNormal" width="52" height="52"/>
-    </resources>
-</document>
diff --git a/CameraViewController/CameraViewController-Bridging-Header.h b/CameraViewController/CameraViewController-Bridging-Header.h
index a3feef8d..3e5d816f 100644
--- a/CameraViewController/CameraViewController-Bridging-Header.h
+++ b/CameraViewController/CameraViewController-Bridging-Header.h
@@ -2,7 +2,6 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "UIImage+Filter.h"
-#import "UIImageView+Filter.h"
+
 #import "CIImage+Utilities.h"
 #import "IRLRectangleFeature+Extensions.h"