Got rid of more useless buffers.