Ding-dong, ExecutionSite is dead!
Merge branch 'master' into ENG-7306
Delete unneeded lines