refactor so that service has fetch tracking numbers which calls fetch tracking data and removes extra fields