Take out CDIF_Queue/CDIF_Message