Remove wifi hack and add no op patch