Revert "fixing s2w listen area"

This reverts commit db831b6f50de9b0f2479aea32302e8c0b5c771dc.
Revert "adding s2w and BLN"

This reverts commit 0866f627a4807b06b20f1b01a3306d1570000237.