Issue 24 Cleaned Message Delivery