Remove old unused shipment overrides

Fixes #34