Added IMessageDeleter interface and drain method