remove dependency on com.sun.*