ENG-6070 Cleanup stuff for review.