For ENG-4359, cleanup based on feedback from Ning