Cleanup
Merge pull request #505 from owdqa/hotfix/WIFI

Cleanup