Removed Locations from ShippingRate

This also affected some code in DBGrabber