Cleanup | Start of hot-swapping data by command