XD-1589 cleanup per PR review