remove message field & fix some bugs