Refactor message verification and rejecting stateless messages