removed unused initializers and pushed deliverey_observer to delivery reference for more advanced semantic