diff --git a/src/main/java/org/olat/course/nodes/BasicLTICourseNode.java b/src/main/java/org/olat/course/nodes/BasicLTICourseNode.java
index 282cfbb594d445a28c48f43eb7b13110eed644d1..4502bdeba0490c77368f414d63cdad99816282e5 100644
--- a/src/main/java/org/olat/course/nodes/BasicLTICourseNode.java
+++ b/src/main/java/org/olat/course/nodes/BasicLTICourseNode.java
@@ -86,18 +86,11 @@ public class BasicLTICourseNode extends AbstractAccessableCourseNode implements
 	private static final String NLS_ERROR_HOSTMISSING_SHORT = "error.hostmissing.short";
 	private static final String NLS_ERROR_HOSTMISSING_LONG = "error.hostmissing.long";
 
-	/**
-	 * Constructor for a course node of type learning content tunneling
-	 */
 	public BasicLTICourseNode() {
 		super(TYPE);
 		updateModuleConfigDefaults(true);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createEditController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl, org.olat.course.ICourse)
-	 */
 	@Override
 	public TabbableController createEditController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel, ICourse course, UserCourseEnvironment euce) {
 		updateModuleConfigDefaults(false);
@@ -106,12 +99,6 @@ public class BasicLTICourseNode extends AbstractAccessableCourseNode implements
 		return new NodeEditController(ureq, wControl, course.getEditorTreeModel(), course, chosenNode, euce, childTabCntrllr);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createNodeRunConstructionResult(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public NodeRunConstructionResult createNodeRunConstructionResult(UserRequest ureq, WindowControl wControl,
 			UserCourseEnvironment userCourseEnv, NodeEvaluation ne, String nodecmd) {
@@ -151,26 +138,13 @@ public class BasicLTICourseNode extends AbstractAccessableCourseNode implements
 		return !assessable && !sendName && !sendEmail && !customValues;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.GenericCourseNode#createPreviewController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public Controller createPreviewController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv, NodeEvaluation ne) {
 		return createNodeRunConstructionResult(ureq, wControl, userCourseEnv, ne, null).getRunController();
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid()
-	 */
 	@Override
 	public StatusDescription isConfigValid() {
-
-		/*
-		 * first check the one click cache
-		 */
 		if (oneClickStatusCache != null) { return oneClickStatusCache[0]; }
 
 		String host = (String) getModuleConfiguration().get(LTIConfigForm.CONFIGKEY_HOST);
@@ -187,9 +161,6 @@ public class BasicLTICourseNode extends AbstractAccessableCourseNode implements
 		return sd;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid(org.olat.course.run.userview.UserCourseEnvironment)
-	 */
 	@Override
 	public StatusDescription[] isConfigValid(CourseEditorEnv cev) {
 		oneClickStatusCache = null;
@@ -200,25 +171,16 @@ public class BasicLTICourseNode extends AbstractAccessableCourseNode implements
 		return oneClickStatusCache;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#getReferencedRepositoryEntry()
-	 */
 	@Override
 	public RepositoryEntry getReferencedRepositoryEntry() {
 		return null;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#needsReferenceToARepositoryEntry()
-	 */
 	@Override
 	public boolean needsReferenceToARepositoryEntry() {
 		return false;
 	}
 	
-	/**
-	 * @see org.olat.course.nodes.CourseNode#cleanupOnDelete(org.olat.course.ICourse)
-	 */
 	@Override
 	public void cleanupOnDelete(ICourse course) {
 		super.cleanupOnDelete(course);
diff --git a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
index 5393dfd58f4fff219c9f5c4d42a5869d44af98b1..1ec07c441299436bd789306c01a23b5e5e522960 100644
--- a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
@@ -245,10 +245,6 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Co
 		return timeLimit;
 	}
 	
-	/**
-	 * 
-	 * @return
-	 */
 	public AssessmentTest loadAssessmentTest(RepositoryEntry testEntry) {
 		if(testEntry == null) return null;
 		
@@ -261,12 +257,6 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Co
 		return null;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createPreviewController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public Controller createPreviewController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv, NodeEvaluation ne) {
 		Controller controller;
@@ -324,14 +314,8 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Co
 		return false;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid()
-	 */
 	@Override
 	public StatusDescription isConfigValid() {
-		/*
-		 * first check the one click cache
-		 */
 		if (oneClickStatusCache != null) { return oneClickStatusCache[0]; }
 
 		boolean isValid = getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY) != null;
@@ -360,9 +344,6 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Co
 		return sd;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid(org.olat.course.run.userview.UserCourseEnvironment)
-	 */
 	@Override
 	public StatusDescription[] isConfigValid(CourseEditorEnv cev) {
 		oneClickStatusCache = null;
@@ -397,9 +378,6 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Co
 		return null;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#cleanupOnDelete(org.olat.course.ICourse)
-	 */
 	@Override
 	public void cleanupOnDelete(ICourse course) {
 		super.cleanupOnDelete(course);
diff --git a/src/main/java/org/olat/course/nodes/MSCourseNode.java b/src/main/java/org/olat/course/nodes/MSCourseNode.java
index 3efe06cefb7c17d4e87be8d2bd301e77af8df3e2..25d69ca00e0d685dbe5908c7de7519a79f952b8a 100644
--- a/src/main/java/org/olat/course/nodes/MSCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/MSCourseNode.java
@@ -127,9 +127,6 @@ public class MSCourseNode extends AbstractAccessableCourseNode implements Course
 	public static final String CONFIG_KEY_EVAL_FORM_SCALE = "evaluation.form.scale";
 	public static final String CONFIG_DEFAULT_EVAL_FORM_SCALE = "1.0";
 
-	/**
-	 * Constructor for a course building block of type manual score
-	 */
 	public MSCourseNode() {
 		super(TYPE);
 		updateModuleConfigDefaults(true);
diff --git a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
index 63ad3b6b9d6b4d63103cecf0f57400832f1286c9..6b34758c60bae5aa130e4ab14a4893ad75411161 100644
--- a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
@@ -155,10 +155,6 @@ public class PortfolioCourseNode extends AbstractAccessableCourseNode implements
 		return new NodeRunConstructionResult(ctrl);
 	}
 	
-	/**
-	 * Default set the write privileges to coaches and admin only
-	 * @return
-	 */
 	public Condition getPreConditionEdit() {
 		if (preConditionEdit == null) {
 			preConditionEdit = new Condition();
@@ -170,10 +166,6 @@ public class PortfolioCourseNode extends AbstractAccessableCourseNode implements
 		return preConditionEdit;
 	}
 
-	/**
-	 * 
-	 * @param preConditionEdit
-	 */
 	public void setPreConditionEdit(Condition preConditionEdit) {
 		if (preConditionEdit == null) {
 			preConditionEdit = getPreConditionEdit();
@@ -201,10 +193,6 @@ public class PortfolioCourseNode extends AbstractAccessableCourseNode implements
 		return null;
 	}
 	
-	private String getReferencedRepositoryEntrySoftkey() {
-		return (String)getModuleConfiguration().get(PortfolioCourseNodeConfiguration.REPO_SOFT_KEY);
-	}
-	
 	@Override
 	public boolean needsReferenceToARepositoryEntry() {
 		return true;
diff --git a/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java b/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
index d009b370c54ff1e56d46bb0a22c4132474895d87..3af56f230160261ba6f767834768a3a724f73107 100644
--- a/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
@@ -167,18 +167,11 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 	private Condition  conditionDrop, conditionScoring, conditionReturnbox;
 	private Condition  conditionProjectBroker;
 
-	/**
-	 * Default constructor.
-	 */
 	public ProjectBrokerCourseNode() {
 		super(TYPE);
 		updateModuleConfigDefaults(true);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createEditController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl, org.olat.course.ICourse)
-	 */
 	@Override
 	public TabbableController createEditController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel, ICourse course, UserCourseEnvironment euce) {
 		updateModuleConfigDefaults(false);
@@ -189,12 +182,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return editController;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createNodeRunConstructionResult(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public NodeRunConstructionResult createNodeRunConstructionResult(UserRequest ureq, WindowControl wControl,
 			UserCourseEnvironment userCourseEnv, NodeEvaluation ne, String nodecmd) {
@@ -226,23 +213,11 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return new NodeRunConstructionResult(wrapperCtrl);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.GenericCourseNode#createPreviewController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public Controller createPreviewController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv, NodeEvaluation ne) {
 		return ProjectBrokerControllerFactory.createPreviewController(ureq, wControl,userCourseEnv, this);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.GenericCourseNode#createPeekViewRunController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public Controller createPeekViewRunController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv,
 			NodeEvaluation ne) {
@@ -255,30 +230,18 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		}
 	}	
 	
-	/**
-	 * @see org.olat.course.nodes.CourseNode#getReferencedRepositoryEntry()
-	 */
 	@Override
 	public RepositoryEntry getReferencedRepositoryEntry() {
 		return null;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#needsReferenceToARepositoryEntry()
-	 */
 	@Override
 	public boolean needsReferenceToARepositoryEntry() {
 		return false;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid()
-	 */
 	@Override
 	public StatusDescription isConfigValid() {
-		/*
-		 * first check the one click cache
-		 */
 		if (oneClickStatusCache != null) { return oneClickStatusCache[0]; }
 
 		boolean isValid = true;
@@ -299,9 +262,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return sd;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid(org.olat.course.run.userview.UserCourseEnvironment)
-	 */
 	@Override
 	public StatusDescription[] isConfigValid(CourseEditorEnv cev) {
 		oneClickStatusCache = null;
@@ -327,10 +287,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		nodeEval.setVisible(visible);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#informOnDelete(org.olat.core.gui.UserRequest,
-	 *      org.olat.course.ICourse)
-	 */
 	@Override
 	public String informOnDelete(Locale locale, ICourse course) {
 		Translator trans = new PackageTranslator(PACKAGE_PROJECTBROKER, locale);
@@ -345,10 +301,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return null; // no data yet.
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#cleanupOnDelete(
-	 *      org.olat.course.ICourse)
-	 */
 	@Override
 	public void cleanupOnDelete(ICourse course) {
 		CoursePropertyManager cpm = course.getCourseEnvironment().getCoursePropertyManager();
@@ -688,9 +640,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return dataFound;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.GenericCourseNode#getConditionExpressions()
-	 */
 	@Override
 	public List<ConditionExpression> getConditionExpressions() {
 		List<ConditionExpression> retVal;
@@ -711,10 +660,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 		return retVal;
 	}
 
-
-	/**
-	 * Init config parameter with default values for a new course node.
-	 */
 	@Override
 	public void updateModuleConfigDefaults(boolean isNewNode) {
 		ModuleConfiguration config = getModuleConfiguration();
@@ -827,9 +772,6 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Course
 	    }
 	}
 	
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createInstanceForCopy()
-	 */
 	@Override
 	public CourseNode createInstanceForCopy(boolean isNewTitle, ICourse course, Identity author) {
 		// create the instance for the copy
diff --git a/src/main/java/org/olat/course/nodes/STCourseNode.java b/src/main/java/org/olat/course/nodes/STCourseNode.java
index a66fd80f9134def8e1a6736196b994e3edb8e731..6ddb214d98e5cdbff40de20e709551cdb238b35e 100644
--- a/src/main/java/org/olat/course/nodes/STCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/STCourseNode.java
@@ -107,9 +107,6 @@ public class STCourseNode extends AbstractAccessableCourseNode implements Course
 	transient private Condition passedExpression;
 	transient private Condition failedExpression;
 
-	/**
-	 * Constructor for a course building block of the type structure
-	 */
 	public STCourseNode() {
 		super(TYPE);
 		updateModuleConfigDefaults(true);
@@ -125,7 +122,6 @@ public class STCourseNode extends AbstractAccessableCourseNode implements Course
 		// special case: listen to st edit controller, must be informed when the short title is being modified
 		nodeEditController.addControllerListener(childTabCntrllr); 
 		return nodeEditController;
-
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/course/nodes/ScormCourseNode.java b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
index 8068c22c032c6faf5345600b6702b588b6e8b5b0..0614828f706ae6d78cf886081bbe408248c7375f 100644
--- a/src/main/java/org/olat/course/nodes/ScormCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
@@ -88,20 +88,12 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Cou
 	private static final String CONFIG_HEIGHT = "height";	
 	private final static String CONFIG_HEIGHT_AUTO = "auto";
 	
-
-	/**
-	 * Constructor for a course building block of the type IMS CP learning content
-	 */
 	public ScormCourseNode() {
 		super(TYPE);
 		// init default values
 		updateModuleConfigDefaults(true);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createEditController(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl, org.olat.course.ICourse)
-	 */
 	@Override
 	public TabbableController createEditController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel, ICourse course, UserCourseEnvironment euce) {
 		updateModuleConfigDefaults(false);
@@ -110,12 +102,6 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Cou
 		return new NodeEditController(ureq, wControl, course.getEditorTreeModel(), course, chosenNode, euce, childTabCntrllr);
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#createNodeRunConstructionResult(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.control.WindowControl,
-	 *      org.olat.course.run.userview.UserCourseEnvironment,
-	 *      org.olat.course.run.userview.NodeEvaluation)
-	 */
 	@Override
 	public NodeRunConstructionResult createNodeRunConstructionResult(UserRequest ureq, WindowControl wControl,
 			UserCourseEnvironment userCourseEnv, NodeEvaluation ne, String nodecmd) {
@@ -135,9 +121,6 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Cou
 
 	@Override
 	public StatusDescription isConfigValid() {
-		/*
-		 * first check the one click cache
-		 */
 		if (oneClickStatusCache != null) { return oneClickStatusCache[0]; }
 
 		StatusDescription sd = StatusDescription.NOERROR;
@@ -155,9 +138,6 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Cou
 		return sd;
 	}
 
-	/**
-	 * @see org.olat.course.nodes.CourseNode#isConfigValid(org.olat.course.run.userview.UserCourseEnvironment)
-	 */
 	@Override
 	public StatusDescription[] isConfigValid(CourseEditorEnv cev) {
 		oneClickStatusCache = null;
diff --git a/src/main/java/org/olat/course/nodes/TACourseNode.java b/src/main/java/org/olat/course/nodes/TACourseNode.java
index f64fc45260dcb7826d359e6221ecb1f928a217d9..6a974ed2c52dc144fc1995c7301d204492062ba1 100644
--- a/src/main/java/org/olat/course/nodes/TACourseNode.java
+++ b/src/main/java/org/olat/course/nodes/TACourseNode.java
@@ -170,9 +170,6 @@ public class TACourseNode extends GenericCourseNode implements CourseNode {
 
 	private static final Logger log = Tracing.createLoggerFor(TACourseNode.class);
 
-	/**
-	 * Default constructor.
-	 */
 	public TACourseNode() {
 		super(TYPE);
 		updateModuleConfigDefaults(true);
@@ -222,9 +219,6 @@ public class TACourseNode extends GenericCourseNode implements CourseNode {
 
 	@Override
 	public StatusDescription isConfigValid() {
-		/*
-		 * first check the one click cache
-		 */
 		if (oneClickStatusCache != null) { return oneClickStatusCache[0]; }
 
 		boolean isValid = true;