Auditer new msg format and some cleanup