Refs #14341 daviz; cleanup code