diff --git a/Evergreen/MainWindow/AddFeed/AddFeedController.swift b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
index f1cf64f74..6b10767b4 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
@@ -56,19 +56,19 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate {
 
 	// MARK: AddFeedWindowControllerDelegate
 
-	func addFeedWindowController(_: AddFeedWindowController, userEnteredURL url: URL, userEnteredTitle title: String?, folder: Folder) {
+	func addFeedWindowController(_: AddFeedWindowController, userEnteredURL url: URL, userEnteredTitle title: String?, container: Container) {
 
 		closeAddFeedSheet(NSApplication.ModalResponse.OK)
-
-		let account = folder.account
-		if account.hasFeed(withURL: url.absoluteString) {
-			showAlreadySubscribedError(url.absoluteString, folder)
-			return
-		}
-
-		userEnteredURL = url
-		userEnteredFolder = folder
-		userEnteredTitle = title
+//
+//		let account = folder.account
+//		if account.hasFeed(withURL: url.absoluteString) {
+//			showAlreadySubscribedError(url.absoluteString, folder)
+//			return
+//		}
+//
+//		userEnteredURL = url
+//		userEnteredFolder = folder
+//		userEnteredTitle = title
 
 		findFeed()
 	}
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
index ab9579d63..e55d763f3 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
@@ -94,19 +94,19 @@ class AddFeedWindowController : NSWindowController {
     
     @IBAction func addFeed(_ sender: AnyObject) {
 		
-		let urlString = urlTextField.stringValue
-		let normalizedURLString = (urlString as NSString).rs_normalizedURL()
-		
-		if normalizedURLString.isEmpty {
-			cancelSheet()
-			return;
-		}
-		guard let url = URL(string: normalizedURLString) else {
-			cancelSheet()
-			return
-		}
+//		let urlString = urlTextField.stringValue
+//		let normalizedURLString = (urlString as NSString).rs_normalizedURL()
+//		
+//		if normalizedURLString.isEmpty {
+//			cancelSheet()
+//			return;
+//		}
+//		guard let url = URL(string: normalizedURLString) else {
+//			cancelSheet()
+//			return
+//		}
 
-		delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, folder: selectedFolder()!)
+//		delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: selectedContainer()!)
     }
 
 	@IBAction func localShowFeedList(_ sender: AnyObject) {
diff --git a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
index 108fe7fa4..03a78ee9a 100644
--- a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
+++ b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
@@ -10,11 +10,6 @@ import Cocoa
 import Data
 import Account
 
-//func addFolderWindowController() -> AddFolderWindowController {
-//	
-//	return AddFolderWindowController(windowNibName: "AddFolderSheet")
-//}
-
 class AddFolderWindowController : NSWindowController {
     
     @IBOutlet var folderNameTextField: NSTextField!