Removing ST2 backwards compatibility, will be maintained in separate branch