Update remaining buffers, cleanup