Clean up
Fix for RIL
Fix connecting wi-fi
Fix flickering