Fix Wifi battery drain & Cleanup