Removing SparseBufferSet from architecture

Improving robustness