Removed useless MsgAll and updated TODO