diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
index 81325742936cf014dfc4306d536615e5728f0ce9..f7a5ac1eaac4fd50b9b2995c7da3623a85c08a6c 100644
--- a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
+++ b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
@@ -69,7 +69,6 @@ import org.olat.course.nodes.ArchiveOptions;
 import org.olat.course.nodes.CourseNode;
 import org.olat.course.nodes.IQTESTCourseNode;
 import org.olat.course.nodes.MSCourseNode;
-import org.olat.course.nodes.STCourseNode;
 import org.olat.course.run.environment.CourseEnvironment;
 import org.olat.course.run.scoring.ScoreAccounting;
 import org.olat.course.run.scoring.ScoreEvaluation;
@@ -370,7 +369,7 @@ public class ScoreAccountingHelper {
 			String minVal;
 			String maxVal;
 			String cutVal;
-			if(acnode instanceof STCourseNode || !assessmentConfig.hasScore()) {
+			if(assessmentConfig.isEvaluationCalculated() || !assessmentConfig.hasScore()) {
 				minVal = maxVal = cutVal = "-";
 			} else {
 				Float minScoreConfig = assessmentConfig.getMinScore();
diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index a4ce0ed874297c14c239f9cc8f10a3a2a917d375..36a3130c87c540b783953b7f6ea8118c49933911 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -168,8 +168,6 @@ public class AssessmentHelper {
 			if (assessmentConfig.hasPassed() || assessmentConfig.hasScore()) {
 				return true;
 			}
-		} else if (node instanceof ProjectBrokerCourseNode) {
-			return false;//no assessment-tool in V1.0 return always false
 		} else if (assessmentConfig.isAssessable()) {
 			return true;
 		}
@@ -456,7 +454,7 @@ public class AssessmentHelper {
 							assessmentNodeData.setScore(score);
 							hasDisplayableUserValues = true;
 						}
-						if(!(courseNode instanceof STCourseNode)) {
+						if(!assessmentConfig.isEvaluationCalculated()) {
 							assessmentNodeData.setMaxScore(assessmentConfig.getMaxScore());
 							assessmentNodeData.setMinScore(assessmentConfig.getMinScore());
 						}
diff --git a/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java b/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
index b3e11ed7173283157841f525daa1ae4a56675bb0..10a45c9e47a716f3af1c748ff3e0681d8c22514f 100644
--- a/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
+++ b/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
@@ -68,7 +68,6 @@ import org.olat.course.groupsandrights.CourseGroupManager;
 import org.olat.course.groupsandrights.CourseRights;
 import org.olat.course.nodes.CourseNode;
 import org.olat.course.nodes.CourseNodeFactory;
-import org.olat.course.nodes.STCourseNode;
 import org.olat.course.nodes.ScormCourseNode;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupService;
@@ -279,7 +278,7 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
 			CourseNode courseNode = (CourseNode)node;
 			CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
 			AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode);
-			if (assessmentConfig.isAssessable() && !(node instanceof STCourseNode)) {
+			if (assessmentConfig.isAssessable() && !assessmentConfig.isEvaluationCalculated()) {
 				result.add(courseNode);
 			}
 
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
index f3588769248fe6c0986cc2e5acd0588d77ed63e7..5ea18a139047f5d53b5353c461ed1b5230f24d69 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
@@ -81,7 +81,6 @@ import org.olat.course.assessment.ui.tool.IdentityListCourseNodeTableModel.Ident
 import org.olat.course.assessment.ui.tool.event.ShowDetailsEvent;
 import org.olat.course.nodes.CourseNode;
 import org.olat.course.nodes.CourseNodeFactory;
-import org.olat.course.nodes.STCourseNode;
 import org.olat.course.run.environment.CourseEnvironment;
 import org.olat.course.run.scoring.ScoreEvaluation;
 import org.olat.course.run.userview.UserCourseEnvironment;
@@ -363,7 +362,7 @@ public class IdentityListCourseNodeController extends FormBasicController
 						new UserVisibilityCellRenderer(getTranslator())));
 			}
 			if(assessmentConfig.hasScore()) {
-				if(!(courseNode instanceof STCourseNode)) {
+				if(!assessmentConfig.isEvaluationCalculated()) {
 					if(assessmentConfig.getMinScore() != null) {
 						columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.min, new ScoreCellRenderer()));
 					}
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java
index 7764d63125995853dfc9dc556adf08ecdcf31f03..88bc27d382ff8a32cd50402f0f00efbea561f7d5 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java
@@ -39,7 +39,6 @@ import org.olat.course.assessment.CourseAssessmentService;
 import org.olat.course.assessment.handler.AssessmentConfig;
 import org.olat.course.certificate.CertificateLight;
 import org.olat.course.nodes.CourseNode;
-import org.olat.course.nodes.STCourseNode;
 import org.olat.modules.assessment.model.AssessmentEntryStatus;
 import org.olat.modules.assessment.ui.AssessedIdentityElementRow;
 
@@ -71,7 +70,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
 		if (courseNode != null) {
 			CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
 			AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode);
-			if(!(courseNode instanceof STCourseNode) && assessmentConfig.hasScore()) {
+			if(!assessmentConfig.isEvaluationCalculated() && assessmentConfig.hasScore()) {
 				maxScore = assessmentConfig.getMaxScore();
 				minScore = assessmentConfig.getMinScore();
 				if (assessmentConfig.hasPassed()) {