Revert "Wifi changes & Moved some options to the common side"

This reverts commit bca9a25a04af1cc8e052cc1aaeae855117728ce9.