drop ST2 support
drop some more ST2 stuff
Removed ST2 support in master