diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index c48d34654b932ad414d5da417d54c47cecc842c0..b104c3046f232ab09fd351e3dafe2d53325d2b4b 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -469,9 +469,6 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     return status.GetCode();
                   })
 
-// TODO(fspreck) Results sets have to be worked over once they have
-// been fixed in the cpplib. Afterwards, creation and at have to be
-// re-implemented.
 ERROR_RETURN_CODE(GENERIC_ERROR,
                   int caosdb_transaction_transaction_get_result_set(
                     caosdb_transaction_transaction *transaction,
@@ -506,9 +503,6 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     caosdb_transaction_result_set *result_set,
                     caosdb_entity_entity *entity, int index),
                   {
-                    // TODO(fspreck) how do we treat this? ResultSet
-                    // is an abstract class, can we always fall back
-                    // to MultiResultSet?
                     auto *wrapped_result_set =
                       static_cast<caosdb::transaction::MultiResultSet *>(
                         result_set->wrapped_result_set);