Revert "Add S2W support"

This reverts commit 560381f205becb3bfe9f74c3347197324ae56dfa.