Add delete function
Add cucumber test for delete
Merge branch 'InternalMessExt'