Remove unnecessary set of non-buffering