remove tokens to function
Drafted DeliveryPointSpecification