diff --git a/src/main/php/lang/Generic.class.php b/src/main/php/lang/Generic.class.php
index 4dc9c77e3b..03324664aa 100755
--- a/src/main/php/lang/Generic.class.php
+++ b/src/main/php/lang/Generic.class.php
@@ -20,15 +20,6 @@ public function hashCode();
    * @return  bool TRUE if the compared object is equal to this object
    */
   public function equals($cmp);
-  
-  /** 
-   * Returns the fully qualified class name for this class 
-   * (e.g. "io.File")
-   * 
-   * @deprecated Use nameof($this) instead.
-   * @return  string fully qualified class name
-   */
-  public function getClassName();
 
   /**
    * Returns the runtime class of an object.
diff --git a/src/main/php/lang/Object.class.php b/src/main/php/lang/Object.class.php
index 48e38bc0af..0ad7343e96 100755
--- a/src/main/php/lang/Object.class.php
+++ b/src/main/php/lang/Object.class.php
@@ -39,17 +39,6 @@ public function equals($cmp) {
     return $this === $cmp;
   }
   
-  /** 
-   * Returns the fully qualified class name for this class 
-   * (e.g. "io.File")
-   *
-   * @deprecated Use nameof($this) instead.
-   * @return  string fully qualified class name
-   */
-  public function getClassName() {
-    return nameof($this);
-  }
-
   /**
    * Returns the runtime class of an object.
    *
diff --git a/src/main/php/lang/Throwable.class.php b/src/main/php/lang/Throwable.class.php
index 9254196bb9..f0625b4980 100644
--- a/src/main/php/lang/Throwable.class.php
+++ b/src/main/php/lang/Throwable.class.php
@@ -261,17 +261,6 @@ public function equals($cmp) {
     return $this === $cmp;
   }
   
-  /** 
-   * Returns the fully qualified class name for this class 
-   * (e.g. "io.File")
-   * 
-   * @deprecated Use nameof($this) instead.
-   * @return  string fully qualified class name
-   */
-  public function getClassName() {
-    return nameof($this);
-  }
-
   /**
    * Returns the runtime class of an object.
    *
diff --git a/src/test/php/net/xp_framework/unittest/core/ExceptionsTest.class.php b/src/test/php/net/xp_framework/unittest/core/ExceptionsTest.class.php
index f8620a459f..acf48714b5 100644
--- a/src/test/php/net/xp_framework/unittest/core/ExceptionsTest.class.php
+++ b/src/test/php/net/xp_framework/unittest/core/ExceptionsTest.class.php
@@ -113,12 +113,6 @@ public function classMethod() {
     $this->assertEquals(XPClass::forName('lang.Throwable'), (new Throwable('Test'))->getClass());
   }
 
-  /** @deprecated */
-  #[@test]
-  public function classNameMethod() {
-    $this->assertEquals('lang.Throwable', (new Throwable('Test'))->getClassName());
-  }
-
   #[@test]
   public function compoundMessage() {
     $this->assertEquals(
diff --git a/src/test/php/net/xp_framework/unittest/core/ObjectTest.class.php b/src/test/php/net/xp_framework/unittest/core/ObjectTest.class.php
index 1c39ea5acc..40860456ca 100644
--- a/src/test/php/net/xp_framework/unittest/core/ObjectTest.class.php
+++ b/src/test/php/net/xp_framework/unittest/core/ObjectTest.class.php
@@ -57,12 +57,6 @@ public function an_object_is_not_equal_to_a_primitive() {
     $this->assertFalse((new Object())->equals(0));
   }
 
-  /** @deprecated */
-  #[@test]
-  public function getClassName_returns_fully_qualified_class_name() {
-    $this->assertEquals('lang.Object', (new Object())->getClassName());
-  }
-
   #[@test]
   public function getClass_returns_XPClass_object() {
     $this->assertEquals(XPClass::forName('lang.Object'), (new Object())->getClass());
diff --git a/src/test/php/net/xp_framework/unittest/core/ThisTest.class.php b/src/test/php/net/xp_framework/unittest/core/ThisTest.class.php
deleted file mode 100644
index 3384ac4aec..0000000000
--- a/src/test/php/net/xp_framework/unittest/core/ThisTest.class.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php namespace net\xp_framework\unittest\core;
-
-/**
- * TestCase for this() core functionality.
- *
- * @deprecated
- */
-class ThisTest extends \unittest\TestCase {
-
-  #[@test]
-  public function arrayOffset() {
-    $this->assertEquals(1, this([1, 2, 3], 0));
-  }
-
-  #[@test]
-  public function mapOffset() {
-    $this->assertEquals('World', this(['Hello' => 'World'], 'Hello'));
-  }
-
-  #[@test]
-  public function stringOffset() {
-    $this->assertEquals('W', this('World', 0));
-  }
-
-  #[@test]
-  public function intOffset() {
-    $this->assertNull(this(0, 0));
-  }
-}
diff --git a/src/test/php/net/xp_framework/unittest/core/generics/InstanceReflectionTest.class.php b/src/test/php/net/xp_framework/unittest/core/generics/InstanceReflectionTest.class.php
index b0ba294d2b..1b3911961d 100755
--- a/src/test/php/net/xp_framework/unittest/core/generics/InstanceReflectionTest.class.php
+++ b/src/test/php/net/xp_framework/unittest/core/generics/InstanceReflectionTest.class.php
@@ -28,15 +28,6 @@ public function nameof() {
     );
   }
 
-  /** @deprecated */
-  #[@test]
-  public function getClassNameMethod() {
-    $this->assertEquals(
-      'net.xp_framework.unittest.core.generics.Lookup<string,unittest.TestCase>', 
-      $this->fixture->getClassName()
-    );
-  }
-
   #[@test]
   public function nameOfClass() {
     $this->assertEquals(
diff --git a/src/test/php/net/xp_framework/unittest/reflection/ProxyTest.class.php b/src/test/php/net/xp_framework/unittest/reflection/ProxyTest.class.php
index 84ef5e37cd..2f5288692b 100644
--- a/src/test/php/net/xp_framework/unittest/reflection/ProxyTest.class.php
+++ b/src/test/php/net/xp_framework/unittest/reflection/ProxyTest.class.php
@@ -137,9 +137,9 @@ public function allInterfacesAreImplemented() {
   #[@test]
   public function iteratorMethods() {
     $expected= [
-      'hashcode', 'equals', 'getclassname', 'getclass', 'tostring', // lang.Object
-      'getproxyclass', 'newproxyinstance',                          // lang.reflect.Proxy
-      'hasnext', 'next'                                             // util.XPIterator
+      'hashcode', 'equals', 'getclass', 'tostring', // lang.Object
+      'getproxyclass', 'newproxyinstance',          // lang.reflect.Proxy
+      'hasnext', 'next'                             // util.XPIterator
     ];
     
     $class= $this->proxyClassFor([$this->iteratorClass]);