remove unnecessary message verification step