Draft: Resolve "Validate that all output is using that client"

General MR

Summary

Changing the last stragglers of printing directly to the output

Relevant logs/screenshots

n/a

Linked Issue

#159

Upgrade Notices

n/a

Closes #159