diff --git a/src/main/java/org/olat/course/assessment/_spring/assessmentContext.xml b/src/main/java/org/olat/course/assessment/_spring/assessmentContext.xml
index 54c25567598f2cf456f866fd0eaa775b5b50bb44..7d54429b1dd5c11f86031092d8bc49d7111f8d98 100644
--- a/src/main/java/org/olat/course/assessment/_spring/assessmentContext.xml
+++ b/src/main/java/org/olat/course/assessment/_spring/assessmentContext.xml
@@ -7,8 +7,6 @@
   http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/context 
   http://www.springframework.org/schema/context/spring-context.xsd">
-
-	<context:component-scan base-package="org.olat.course.assessment" />
 	
 	<bean id="assessmentNotificationsTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 	    <property name="jobDetail" ref="assessmentNotificationsJob" />
diff --git a/src/main/java/org/olat/course/db/_spring/coursedbContext.xml b/src/main/java/org/olat/course/db/_spring/coursedbContext.xml
index 6733896f7440456af9f6a1811e5cfa94cd582326..d029724eb790ba0ec92ffdcb0dce3e58a8eafe4d 100644
--- a/src/main/java/org/olat/course/db/_spring/coursedbContext.xml
+++ b/src/main/java/org/olat/course/db/_spring/coursedbContext.xml
@@ -7,8 +7,6 @@
   http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/context 
   http://www.springframework.org/schema/context/spring-context.xsd">
-	
-	<context:component-scan base-package="org.olat.course.db.impl" />
 
 	<bean id="courseDbWebService" class="org.olat.course.db.restapi.CourseDbWebService" />
 
diff --git a/src/main/java/org/olat/modules/_spring/modulesContext.xml b/src/main/java/org/olat/modules/_spring/modulesContext.xml
index fcdb8fcb111dc48d3441c7e73d90846f281f2343..7e506a0ac4cd876f412bed420861fe3f68b15d7b 100644
--- a/src/main/java/org/olat/modules/_spring/modulesContext.xml
+++ b/src/main/java/org/olat/modules/_spring/modulesContext.xml
@@ -14,8 +14,6 @@
 	<import resource="classpath:/org/olat/modules/glossary/_spring/glossaryContext.xml"/>
 	<import resource="classpath:/org/olat/modules/iq/_spring/iqContext.xml"/>
 	<import resource="classpath:/org/olat/modules/lecture/_spring/lectureContext.xml"/>
-	<import resource="classpath:/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml"/>
-	<import resource="classpath:/org/olat/modules/vitero/_spring/viteroContext.xml"/>
 	<import resource="classpath:/org/olat/modules/webFeed/_spring/webFeedContext.xml"/>
 	<import resource="classpath:/org/olat/modules/wiki/_spring/wikiContext.xml"/>
 	<import resource="classpath:/org/olat/modules/reminder/_spring/reminderContext.xml"/>
@@ -104,4 +102,46 @@
 		</property>
 	</bean>
 	
+	<!-- vitero admin. panel -->
+	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
+		<property name="order" value="8228" />
+		<property name="actionController">	
+			<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
+				<property name="factoryName" value="org.olat.modules.vitero.ViteroUIFactory"/>
+				<property name="factoryMethod" value="createViteroAdminController"/>
+			</bean>
+		</property>
+		<property name="navigationKey" value="vitero" />
+		<property name="parentTreeNodeIdentifier" value="externalToolsParent" /> 
+		<property name="i18nActionKey" value="admin.menu.title"/>
+		<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
+		<property name="translationPackage" value="org.olat.modules.vitero.ui"/>
+		<property name="extensionPoints">
+			<list>	
+				<value>org.olat.admin.SystemAdminMainController</value>		
+			</list>
+		</property>
+	</bean>
+	
+	<!-- OpenMeetings admin. panel -->
+	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
+		<property name="order" value="7210" />
+		<property name="actionController">	
+			<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
+				<property name="factoryName" value="org.olat.modules.openmeetings.OpenMeetingsUIFactory"/>
+				<property name="factoryMethod" value="createAdminController"/>
+			</bean>
+		</property>
+		<property name="navigationKey" value="openmeetings" />
+		<property name="parentTreeNodeIdentifier" value="externalToolsParent" /> 
+		<property name="i18nActionKey" value="admin.menu.title"/>
+		<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
+		<property name="translationPackage" value="org.olat.modules.openmeetings.ui"/>
+		<property name="extensionPoints">
+			<list>	
+				<value>org.olat.admin.SystemAdminMainController</value>		
+			</list>
+		</property>
+	</bean>
+	
 </beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml b/src/main/java/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml
deleted file mode 100644
index d53ed9339a8c5edfab4fe1ca210b4cd89094ddde..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context" 
-	xsi:schemaLocation="
-  http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://www.springframework.org/schema/context 
-  http://www.springframework.org/schema/context/spring-context.xsd">
-  
-	<context:component-scan base-package="org.olat.modules.openmeetings" />
-
-	<!-- OpenMeetings admin. panel -->
-	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
-		<property name="order" value="7210" />
-		<property name="actionController">	
-			<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
-				<property name="factoryName" value="org.olat.modules.openmeetings.OpenMeetingsUIFactory"/>
-				<property name="factoryMethod" value="createAdminController"/>
-			</bean>
-		</property>
-		<property name="navigationKey" value="openmeetings" />
-		<property name="parentTreeNodeIdentifier" value="externalToolsParent" /> 
-		<property name="i18nActionKey" value="admin.menu.title"/>
-		<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
-		<property name="translationPackage" value="org.olat.modules.openmeetings.ui"/>
-		<property name="extensionPoints">
-			<list>	
-				<value>org.olat.admin.SystemAdminMainController</value>		
-			</list>
-		</property>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/vitero/_spring/viteroContext.xml b/src/main/java/org/olat/modules/vitero/_spring/viteroContext.xml
deleted file mode 100644
index e770b7fd4ddf0a588b18b62877bee29172af41d9..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/vitero/_spring/viteroContext.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context" 
-	xsi:schemaLocation="
-  http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://www.springframework.org/schema/context 
-  http://www.springframework.org/schema/context/spring-context.xsd">
-  
-	<context:component-scan base-package="org.olat.modules.vitero" />
-	
-	<!-- vitero admin. panel -->
-	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
-		<property name="order" value="8228" />
-		<property name="actionController">	
-			<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
-				<property name="factoryName" value="org.olat.modules.vitero.ViteroUIFactory"/>
-				<property name="factoryMethod" value="createViteroAdminController"/>
-			</bean>
-		</property>
-		<property name="navigationKey" value="vitero" />
-		<property name="parentTreeNodeIdentifier" value="externalToolsParent" /> 
-		<property name="i18nActionKey" value="admin.menu.title"/>
-		<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
-		<property name="translationPackage" value="org.olat.modules.vitero.ui"/>
-		<property name="extensionPoints">
-			<list>	
-				<value>org.olat.admin.SystemAdminMainController</value>		
-			</list>
-		</property>
-		
-	</bean>
-</beans>
\ No newline at end of file