Revert "Add ShipmentInterface and corresponding getter/setter methods on Shipment. Change code to use these getter/setter methods." This reverts commit 9f8acfbc.
