Moved comment out of Delivery to Service