Remove buffering per @swails