Remove unnecessary MessageUtil and static link