[cleanup] Removed dependency on an internal class