Common i did this
Revert "initial s2w dt2w code import from @showp1984"

This reverts commit 7bec312c0716fd43958717a07374b3d3d226aeda.