diff --git a/include/ccaosdb.h b/include/ccaosdb.h
index 4597690ee2f77e18b086df702b97642b18d19744..a1bbe1c1491e4a140350f4d9ee1bf658382e4d28 100644
--- a/include/ccaosdb.h
+++ b/include/ccaosdb.h
@@ -341,7 +341,8 @@ int caosdb_entity_entity_get_description(caosdb_entity_entity *entity,
                                          char *out);
 int caosdb_entity_entity_get_datatype(caosdb_entity_entity *entity, char *out);
 int caosdb_entity_entity_get_unit(caosdb_entity_entity *entity, char *out);
-int caosdb_entity_entity_get_value(caosdb_entity_entity *entity, char *out);
+// TODO(fspreck)replace by more specific getters
+// int caosdb_entity_entity_get_value(caosdb_entity_entity *entity, char *out);
 int caosdb_entity_entity_get_version_id(caosdb_entity_entity *entity,
                                         char *out);
 int caosdb_entity_entity_get_errors_size(caosdb_entity_entity *entity,
@@ -375,8 +376,9 @@ int caosdb_entity_property_get_datatype(caosdb_entity_property *property,
                                         char *out);
 int caosdb_entity_property_get_unit(caosdb_entity_property *property,
                                     char *out);
-int caosdb_entity_property_get_value(caosdb_entity_property *property,
-                                     char *out);
+// TODO(fspreck) replace by more specific getter
+// int caosdb_entity_property_get_value(caosdb_entity_property *property,
+//                                char *out);
 
 int caosdb_entity_parent_get_id(caosdb_entity_parent *parent, char *out);
 int caosdb_entity_parent_get_name(caosdb_entity_parent *parent, char *out);
@@ -406,8 +408,9 @@ int caosdb_entity_entity_set_datatype(caosdb_entity_entity *entity,
                                       const char *datatype);
 int caosdb_entity_entity_set_unit(caosdb_entity_entity *entity,
                                   const char *unit);
-int caosdb_entity_entity_set_value(caosdb_entity_entity *entity,
-                                   const char *value);
+// TODO(fspreck) replace by more specific setters
+// int caosdb_entity_entity_set_value(caosdb_entity_entity *entity,
+//                               const char *value);
 int caosdb_entity_entity_append_parent(caosdb_entity_entity *entity,
                                        caosdb_entity_parent *parent);
 int caosdb_entity_entity_remove_parent(caosdb_entity_entity *entity, int index);
@@ -426,8 +429,9 @@ int caosdb_entity_property_set_importance(caosdb_entity_property *property,
                                           const char *importance);
 int caosdb_entity_property_set_unit(caosdb_entity_property *property,
                                     const char *unit);
-int caosdb_entity_property_set_value(caosdb_entity_property *property,
-                                     const char *value);
+// TODO(fspreck) replace by more specific setters
+// int caosdb_entity_property_set_value(caosdb_entity_property *property,
+//                                 const char *value);
 
 int caosdb_entity_parent_set_id(caosdb_entity_parent *parent, const char *id);
 int caosdb_entity_parent_set_name(caosdb_entity_parent *parent,