Remove unneeded buffers
Added parameter to bonsai.