Cleanup for DataStore changes