Cleanup noop in message

The noop loop are dead, so clean it up.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
@liewegas done in the newest commit :)