The responsibility to remove a feed from a folder has been moved to the new User.remove_feed_from_folder method. This greatly simplifies the FoldersController#remove method.