Removed legacy message code