For ENG-6115, cleanup based on Stefano's feedback