Added ES SCM; removed unused code.