Cleanup from the system tracked properties refactoring.