Remove un-needed output buffering