Eliminate all tenus dependencies.

[#83588476]