Removes commented out code from esi plugin (#7273)

6 files changed