Cleanup, refs #16778