remove unnecessary code and add shipment controller