diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index c5f02449e1..56715531bd 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -3365,7 +3365,6 @@ type
     tvsIsEditing,
     tvsStateChanging,
     tvsManualNotify,
-    tvsUpdating,   // NOTE: This state is deprecated and has no functionality after r64855
     tvsPainting,
     tvoFocusedPainting,
     tvsDblClicked,
diff --git a/lcl/controls.pp b/lcl/controls.pp
index 2b4f7033b1..0a50eabd85 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -1596,10 +1596,9 @@ type
     property OnStartDrag: TStartDragEvent read FOnStartDrag write FOnStartDrag;
     property OnEditingDone: TNotifyEvent read FOnEditingDone write FOnEditingDone;
   public
-    FCompStyle: Byte; // DEPRECATED. Enables (valid) use of 'IN' operator (this
-      // is a hack for speed. It will be replaced by the use of the widgetset
-      // classes.
-      // So, don't use it anymore.
+    // Enables (valid) use of 'IN' operator. A hack for speed. Will be replaced by
+    // using the widgetset classes. Now used in over 100 places in Lazarus sources.
+    FCompStyle: Byte;
   public
     // drag and dock
     procedure DragDrop(Source: TObject; X,Y: Integer); virtual;