Properly delete all the Data message.
Merge branch 'improper_delete'