Remove simple buffer, replacing with collections.deque