Cleanup

cleanup, refs #17508