#8 remove XCMessage from client of core