Dropping bufio reader after master merge
Removed \r's everywhere.