remove #ifdef STES - causing regression test failures
6 files changed