fix the demo messages that are not used anymore