diff --git a/Frameworks/Account/FeedFinder/FeedFinder.swift b/Frameworks/Account/FeedFinder/FeedFinder.swift
index 479598248..8044295fa 100644
--- a/Frameworks/Account/FeedFinder/FeedFinder.swift
+++ b/Frameworks/Account/FeedFinder/FeedFinder.swift
@@ -124,7 +124,7 @@ private extension FeedFinder {
 	}
 
 	static func isHTML(_ data: Data) -> Bool {
-		return (data as NSData).rs_dataIsProbablyHTML()
+		return data.isProbablyHTML
 	}
 
 	static func downloadFeedSpecifiers(_ downloadFeedSpecifiers: Set<FeedSpecifier>, feedSpecifiers: [String: FeedSpecifier], completion: @escaping (Result<Set<FeedSpecifier>, Error>) -> Void) {
diff --git a/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift b/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift
index 2b7f198e2..82581d1e9 100644
--- a/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift
+++ b/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift
@@ -73,7 +73,7 @@ extension LocalAccountRefresher: DownloadSessionDelegate {
 			return
 		}
 
-		let dataHash = (data as NSData).rs_md5HashString()
+		let dataHash = data.md5String
 		if dataHash == feed.contentHash {
 			completion()
 			return
@@ -137,6 +137,6 @@ private extension Data {
 	
 	func isDefinitelyNotFeed() -> Bool {
 		// We only detect a few image types for now. This should get fleshed-out at some later date.
-		return (self as NSData).rs_dataIsImage()
+		return self.isImage
 	}
 }
diff --git a/Frameworks/Articles/DatabaseID.swift b/Frameworks/Articles/DatabaseID.swift
index a8b4590e3..86b6dc5de 100644
--- a/Frameworks/Articles/DatabaseID.swift
+++ b/Frameworks/Articles/DatabaseID.swift
@@ -26,7 +26,7 @@ public func databaseIDWithString(_ s: String) -> String {
 		return identifier
 	}
 	
-	let identifier = s.md5HashString
+	let identifier = s.md5String
 	databaseIDCache[s] = identifier
 	return identifier
 }
diff --git a/Mac/CrashReporter/CrashReporter.swift b/Mac/CrashReporter/CrashReporter.swift
index 28138fb94..ddd3e5ad5 100644
--- a/Mac/CrashReporter/CrashReporter.swift
+++ b/Mac/CrashReporter/CrashReporter.swift
@@ -30,7 +30,7 @@ struct CrashLog {
 			return nil
 		}
 		self.content = s
-		self.contentHash = s.md5HashString
+		self.contentHash = s.md5String
 		self.path = path
 		self.modificationDate = modificationDate
 	}
diff --git a/Shared/Favicons/SingleFaviconDownloader.swift b/Shared/Favicons/SingleFaviconDownloader.swift
index a5e0a7e91..8a37486f3 100644
--- a/Shared/Favicons/SingleFaviconDownloader.swift
+++ b/Shared/Favicons/SingleFaviconDownloader.swift
@@ -34,7 +34,7 @@ final class SingleFaviconDownloader {
 	private let queue: DispatchQueue
 
 	private var diskKey: String {
-		return faviconURL.md5HashString
+		return faviconURL.md5String
 	}
 
 	init(faviconURL: String, homePageURL: String?, diskCache: BinaryDiskCache, queue: DispatchQueue) {
diff --git a/Shared/Images/ImageDownloader.swift b/Shared/Images/ImageDownloader.swift
index bfae2fce2..7ea33c0ac 100644
--- a/Shared/Images/ImageDownloader.swift
+++ b/Shared/Images/ImageDownloader.swift
@@ -128,7 +128,7 @@ private extension ImageDownloader {
 
 	func diskKey(_ url: String) -> String {
 
-		return url.md5HashString
+		return url.md5String
 	}
 
 	func postImageDidBecomeAvailableNotification(_ url: String) {