minor cleanup

+review REVIEW-5225