API output cleanup, refs #6238