Remove workaround in result scope management