diff --git a/modules/google_search_20/google_search_20-safe.ecf b/modules/google_search_20/google_search_20-safe.ecf
index 5e0ece5..26827d4 100644
--- a/modules/google_search_20/google_search_20-safe.ecf
+++ b/modules/google_search_20/google_search_20-safe.ecf
@@ -8,13 +8,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
-		<library name="cms_config" location="..\..\library\configuration\config-safe.ecf"/>
-		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
-		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
-		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 </system>
diff --git a/modules/google_search_20/google_search_20.ecf b/modules/google_search_20/google_search_20.ecf
index 4c86d8f..2136d60 100644
--- a/modules/google_search_20/google_search_20.ecf
+++ b/modules/google_search_20/google_search_20.ecf
@@ -5,15 +5,9 @@
 		<option is_attached_by_default="false" void_safety="none">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
-		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
-		<library name="cms_config" location="..\..\library\configuration\config.ecf"/>
-		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
-		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
-		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 </system>
diff --git a/modules/google_search_20/src/google_custom_search_module_20.e b/modules/google_search_20/src/google_custom_search_module_20.e
index 5338dd3..cfa2e8a 100644
--- a/modules/google_search_20/src/google_custom_search_module_20.e
+++ b/modules/google_search_20/src/google_custom_search_module_20.e
@@ -22,13 +22,6 @@ inherit
 
 	CMS_HOOK_BLOCK_HELPER
 
-	SHARED_EXECUTION_ENVIRONMENT
-		export
-			{NONE} all
-		end
-
-	REFACTORING_HELPER
-
 	SHARED_LOGGER
 
 create
diff --git a/tools/install.bat b/tools/install.bat
index 78effb9..e2dfefa 100644
--- a/tools/install.bat
+++ b/tools/install.bat
@@ -54,6 +54,7 @@ echo Install ROC as CMS ewf
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\library
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\src
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\doc
+%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\modules
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\examples
 
@@ -62,6 +63,7 @@ echo Install ROC as CMS ewf
 %COPYCMD% %TMP_DIR%\src	%TMP_UNSTABLE_DIR%\library\web\cms\src
 %COPYCMD% %TMP_DIR%\doc	%TMP_UNSTABLE_DIR%\library\web\cms\doc
 %COPYCMD% %TMP_DIR%\modules	%TMP_UNSTABLE_DIR%\library\web\cms\modules
+%COPYCMD% %TMP_DIR%\dev_modules	%TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
 %COPYCMD% %TMP_DIR%\examples	%TMP_UNSTABLE_DIR%\library\web\cms\examples
 echo TOOLS
 %COPYCMD% %TMP_DIR%\tools	%TMP_UNSTABLE_DIR%\library\web\cms\tools