change: remove jdk internal class usage