diff --git a/Mastodon/Diffable/Onboarding/PickServerSection.swift b/Mastodon/Diffable/Onboarding/PickServerSection.swift
index 24e4d2ffb..ef7ca5972 100644
--- a/Mastodon/Diffable/Onboarding/PickServerSection.swift
+++ b/Mastodon/Diffable/Onboarding/PickServerSection.swift
@@ -48,7 +48,6 @@ extension PickServerSection {
 extension PickServerSection {
     
     static func configure(cell: PickServerCell, server: Mastodon.Entity.Server, attribute: PickServerItem.ServerItemAttribute) {
-        //TODO: @zeitschlag configure cell if server doesn't allow registrations
         cell.domainLabel.text = server.domain
         cell.descriptionLabel.attributedText = {
             let content: String = {
diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
index e199ea96c..4cbe77b9c 100644
--- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
@@ -83,8 +83,6 @@ class PickServerCell: UITableViewCell {
         return label
     }()
 
-    //TODO: @zeitschlag New label for "Registrations closed"
-    
     private var collapseConstraints: [NSLayoutConstraint] = []
     private var expandConstraints: [NSLayoutConstraint] = []
     
diff --git a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
index 56b4cd327..4267810b7 100644
--- a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
+++ b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
@@ -22,7 +22,6 @@ extension Mastodon.Entity {
         public let approvalRequired: Bool
         public let language: String
         public let category: String
-        //TODO: @zeitschlag Is there a way to figure out in advance if a server accepts new registrations? Right now we'd have to query the server and it responds with a `AuthenticationViewModel.AuthenticationError.registrationClosed`
 
         enum CodingKeys: String, CodingKey {
             case domain