Merge "Remove dead code, mostly DataStateTracker."