remove message check and drop PY3 constant