diff --git a/src/easy/entities/account.cpp b/src/easy/entities/account.cpp
index fbcd9c6..8ec9cf8 100644
--- a/src/easy/entities/account.cpp
+++ b/src/easy/entities/account.cpp
@@ -180,7 +180,6 @@ const Account Account::moved() const
 {
     if (has_moved())
     {
-        // TODO: Find an account with moved-node and test
         return Account(get("moved").toStyledString());
     }
 
diff --git a/src/easy/entities/status.cpp b/src/easy/entities/status.cpp
index 8001d5e..378383e 100644
--- a/src/easy/entities/status.cpp
+++ b/src/easy/entities/status.cpp
@@ -171,7 +171,6 @@ const std::vector<Easy::Attachment> Status::media_attachments() const
 Status Status::media_attachments
     (const std::vector<Attachment> &media_attachments)
 {
-    // FIXME: Needs writable Easy::Attachment()
     Json::Value jsonarray(Json::arrayValue);
 
     for (const Attachment &att : media_attachments)