Delivery confirm on media, cleanup

issue #1915