For ENG-4047: remove commented code