remove unnesessary message tool #18

remove unnesessary message tool #18 using cherry-pick 7451567b2075529f6b31ab1bd0cf5c562a3dba50