Remove WiFi hack and add no op patch