Removed the message code