COMMS: Remove data message type