Remove self-check, message format