Cleanup and move segment tree probabilities out of persistent state