For ENG-6702, clean up based on review feedback