[CLEANUP] Remove usage of self::class