Revert "Added in Extra options.. S2W"

This reverts commit 27ee77ca7a870fea254cc8e47439c4f3c941599a.