[US21.2] Remove useless buffering code and increase read buffer size