make units not depend on CF CLI

[#72365090]