Remove not needed CircularBuffer data structure