diff --git a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
index 62a56ebf248e9601ea4e281f84a0d043bef68a61..ccf86de57ceecb7892b04bda331b956d25147c57 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
+++ b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
@@ -39,14 +39,9 @@
 namespace armarx
 {
 
-    ObjectPoseObserverPropertyDefinitions::ObjectPoseObserverPropertyDefinitions(std::string prefix) :
-        armarx::ObserverPropertyDefinitions(prefix)
-    {
-    }
-
     armarx::PropertyDefinitionsPtr ObjectPoseObserver::createPropertyDefinitions()
     {
-        armarx::PropertyDefinitionsPtr defs(new ObjectPoseObserverPropertyDefinitions(getConfigIdentifier()));
+        armarx::PropertyDefinitionsPtr defs(new ComponentPropertyDefinitions(getConfigIdentifier()));
 
         defs->defineOptionalProperty<std::string>("ObjectPoseTopicName", "ObjectPoseTopic", "Name of the Object Pose Topic.");
         defs->defineOptionalProperty<std::string>("KinematicUnitObserverName", "KinematicUnitObserver", "Name of the kinematic unit observer.");
diff --git a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
index 8fb3369ceaed1f4880037c741bd74f8e2eb5625e..d29ad4565a4e557507721f44d857e017db88d931 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
+++ b/source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
@@ -42,18 +42,6 @@
 
 namespace armarx
 {
-    /**
-     * @class ObjectPoseObserverPropertyDefinitions
-     * @brief Property definitions of `ObjectPoseObserver`.
-     */
-    class ObjectPoseObserverPropertyDefinitions :
-        public ObserverPropertyDefinitions
-    {
-    public:
-        ObjectPoseObserverPropertyDefinitions(std::string prefix);
-    };
-
-
 
     /**
      * @defgroup Component-ObjectPoseObserver ObjectPoseObserver