Cleanup before implementing ShuffleBAR 0.2