Removed circular buffers