For ENG-5088, do some cleanup based on Ning's feedback