EMBRYO-32: ShipService removed