Remove usage of output buffering