Removed deprecated SBT functionality.
Merge branch 'master' into SFX-8