[server][UnifiedDataStore] Clean up.
[server][UnifiedDataStore] Narrow a range of a variable.