wifi fix and cleanup