Moved more tracking code to DeviceTracker