Missing 'Message' messagetype

Also removed unused types.