For ENG-4786, cleanup based on Ning's feedback