Eliminate cl package dependence.