diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index 6d4b45181d198a12d0bac9eed9f77d774e8ebaa0..d3eb7846d05d80ce406748799db9141d1bdd76fa 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -450,7 +450,6 @@ public:
   auto AppendProperty(const Property &property) -> void;
 
   auto AppendParent(const Parent &parent) -> void;
-  auto Switch(ProtoEntity *entity) -> void;
   /**
    * Copy all of this entity's features to the target ProtoEntity.
    */
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index 999ba3753b068909dc7dd54518ca5ff8bd8033bf..1d616663642c11737228ce02b4e1fd15fc8d77a6 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -177,13 +177,6 @@ auto Entity::SetVersionId(const std::string &id) -> void {
   this->wrapped->mutable_version()->set_id(id);
 }
 
-// TODO(tf) Re-implement s.th. properties and parents are kept.
-auto Entity::Switch(ProtoEntity *entity) -> void {
-  this->wrapped->Swap(entity);
-  this->wrapped->Clear();
-  this->wrapped = entity;
-}
-
 auto Entity::CopyTo(ProtoEntity *target) -> void {
   target->CopyFrom(*(this->wrapped));
 }