Revert "S2W & DT2W"

This reverts commit
e128aef98d8df9f739acedcecd86e373640b6ef8
S2W&DT2W Wip
clean