Improved read timeout (w32)
Comment out unused functions