Remove unused macro
Remove angle brackets from the value of messageid #4