diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index 2a7494174d..155076b0c9 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -681,7 +681,6 @@
 				D6333B762138D94E00CE884A /* ComposeMediaView.swift */,
 				D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */,
 				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
-				D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */,
 				D641C78A213DD926004B4513 /* Status */,
 				D641C78B213DD92F004B4513 /* Profile Header */,
 				D641C78C213DD937004B4513 /* Notifications */,
@@ -706,6 +705,7 @@
 				D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */,
 				D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */,
 				D6E0DC8D216EDF1E00369478 /* Previewing.swift */,
+				D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
diff --git a/Tusker/Screens/Conversation/ConversationTableViewController.swift b/Tusker/Screens/Conversation/ConversationTableViewController.swift
index 404decb57c..73f6dc8d2b 100644
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@@ -97,16 +97,6 @@ class ConversationTableViewController: UITableViewController {
         }
         return parents
     }
-
-    /*
-     // MARK: - Navigation
-     
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
     
     // MARK: - Table view data source
 
diff --git a/Tusker/Screens/Large Image/LargeImageViewController.swift b/Tusker/Screens/Large Image/LargeImageViewController.swift
index 18ba2ab314..32d694dd32 100644
--- a/Tusker/Screens/Large Image/LargeImageViewController.swift	
+++ b/Tusker/Screens/Large Image/LargeImageViewController.swift	
@@ -173,16 +173,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate {
             self.view.layoutIfNeeded()
         })
     }
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
     
     @objc func scrollViewPressed(_ sender: UITapGestureRecognizer) {
         if scrollView.zoomScale > scrollView.minimumZoomScale {
diff --git a/Tusker/Screens/Main/MainTabBarViewController.swift b/Tusker/Screens/Main/MainTabBarViewController.swift
index cb8bd13db4..7bd98b6cd0 100644
--- a/Tusker/Screens/Main/MainTabBarViewController.swift
+++ b/Tusker/Screens/Main/MainTabBarViewController.swift
@@ -57,15 +57,5 @@ class MainTabBarViewController: UITabBarController {
             return UINavigationController(rootViewController: vc)
         }
     }
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
     
 }
diff --git a/Tusker/Screens/Onboarding/OnboardingViewController.swift b/Tusker/Screens/Onboarding/OnboardingViewController.swift
index a6a2ebc6a1..ebfefdd865 100644
--- a/Tusker/Screens/Onboarding/OnboardingViewController.swift
+++ b/Tusker/Screens/Onboarding/OnboardingViewController.swift
@@ -79,15 +79,5 @@ class OnboardingViewController: UIViewController {
         LocalData.shared.clientSecret = nil
         LocalData.shared.accessToken = nil
     }
-    
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
 
 }
diff --git a/Tusker/Screens/Profile/ProfileTableViewController.swift b/Tusker/Screens/Profile/ProfileTableViewController.swift
index 256f56b97d..1d9b5aba02 100644
--- a/Tusker/Screens/Profile/ProfileTableViewController.swift
+++ b/Tusker/Screens/Profile/ProfileTableViewController.swift
@@ -152,16 +152,6 @@ class ProfileTableViewController: UITableViewController, PreferencesAdaptive {
         present(vc, animated: true)
     }
     
-    /*
-     // MARK: - Navigation
-     
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
-    
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
diff --git a/Tusker/Screens/Timeline/TimelineTableViewController.swift b/Tusker/Screens/Timeline/TimelineTableViewController.swift
index 23ed665359..4f410abb41 100644
--- a/Tusker/Screens/Timeline/TimelineTableViewController.swift
+++ b/Tusker/Screens/Timeline/TimelineTableViewController.swift
@@ -93,16 +93,6 @@ class TimelineTableViewController: UITableViewController {
             }
         }
     }
-
-    /*
-     // MARK: - Navigation
-     
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
     
     // MARK: - Table view data source
 
diff --git a/Tusker/Views/TableViewSwipeActionProvider.swift b/Tusker/Screens/Utilities/TableViewSwipeActionProvider.swift
similarity index 100%
rename from Tusker/Views/TableViewSwipeActionProvider.swift
rename to Tusker/Screens/Utilities/TableViewSwipeActionProvider.swift