diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index 451e1318d953c603034787a5f8465189b3b4679b..f34089e00c04130289cbc214f766633c1d330cff 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -824,26 +824,6 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     return 0;
                   })
 
-// TODO(fspreck) Fix this somehow. It segfaults. Bleh.
-// ERROR_RETURN_CODE(GENERIC_ERROR,
-//                   int caosdb_entity_property_get_string_list_value(
-//                     caosdb_entity_property *property, char ***out),
-//                   {
-//                     auto *wrapped_property = WRAPPED_PROPERTY_CAST(property);
-//                     auto value_list = wrapped_property->GetValue().AsList();
-//                     delete[] * out;
-//                     std::vector<char *> out_list;
-//                     char *tmp;
-//                     out_list.reserve(value_list.size());
-//                     for (size_t i = 0; i < value_list.size(); i++) {
-//                       tmp = new char[value_list[i].AsString().size() + 1];
-//                       strcpy(tmp, value_list[i].AsString().c_str());
-//                       out_list.push_back(tmp);
-//                     }
-//                     *out = &out_list[0];
-//                     return 0;
-//                   })
-
 ERROR_RETURN_CODE(GENERIC_ERROR,
                   int caosdb_entity_property_get_value_list_length(caosdb_entity_property *property,
                                                                    int *out),
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 7540177211204828518cdf4b86494ae2bcab45ae..35f2cf3de4bb2453e2f442d3e6e67c0564df2af1 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -276,7 +276,6 @@ TEST_F(test_ccaosdb, test_list_property) {
   EXPECT_EQ(return_code, 0);
   EXPECT_EQ(*length, 3);
 
-  // TODO(fspreck) get and compare values in list. Segfaults as it is right now.
   char *out = nullptr; // NOLINT
   for (int i = 0; i < *length; i++) {
     return_code = caosdb_entity_property_get_string_list_value_at(&property, &out, i);