diff --git a/Code_Igniter/application/controllers/front.php b/Code_Igniter/application/controllers/front.php
index 0739abb8..d979137f 100644
--- a/Code_Igniter/application/controllers/front.php
+++ b/Code_Igniter/application/controllers/front.php
@@ -31,17 +31,6 @@ function __construct()
 
 	public function index()
 	{
-		$default_library_scripts = array(
-			'/libraries/enketo-core/lib/jquery.min.js',
-			'/libraries/enketo-core/lib/bootstrap.min.js',
-			'/libraries/enketo-core/lib/modernizr.min.js'
-		);
-		$default_main_scripts = array(
-			'/libraries/enketo-core/src/js/utils.js',
-			'/js-source/gui.js',
-			'/js-source/connection.js',
-			'/js-source/front.js'
-		);
 		$data = array(
 			'offline'			=> FALSE, 
 			'title_component'	=> '', 
diff --git a/Code_Igniter/application/views/modern_browsers_view.php b/Code_Igniter/application/views/modern_browsers_view.php
index 62e31c98..84e97105 100644
--- a/Code_Igniter/application/views/modern_browsers_view.php
+++ b/Code_Igniter/application/views/modern_browsers_view.php
@@ -7,23 +7,6 @@
     <meta name="description" content="">
     <meta name="keywords" content="">
     <meta name="robots" content="">
-    
-    <script type="text/javascript" src="/libraries/enketo-core/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="/libraries/enketo-core/lib/modernizr.min.js"></script>
-	<script type="text/javascript">
-		var notSupported = [], and='';
-		if (!Modernizr.localstorage) notSupported.push('local data storage');
-		if (!Modernizr.applicationcache) notSupported.push('offline launch');
-		if (notSupported.length === 2) and = ' and ';
-		$(function(){
-			if (notSupported.length > 0){
-				notSupported.push('');
-				$('#not-supported').text(
-					' (we detected that your browser does not support '+notSupported[0]+and+notSupported[1]+')'
-				);
-			}	
-		});	
-	</script>
     <? if (ENVIRONMENT === 'production'){include 'elements/tracking.php';}?>
 </head>
 
diff --git a/Gruntfile.js b/Gruntfile.js
index b735a5fe..b87165fc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -95,7 +95,7 @@ module.exports = function( grunt ) {
                                 "xpath": "../../../../test/mock/empty.mock",
                                 "file-manager": "../../../../test/mock/empty.mock",
                                 "jquery.xpath": "../../../../test/mock/empty.mock",
-                                "Modernizr": "../../../../test/mock/empty.mock",
+                                "support": "../../../../test/mock/empty.mock",
                                 "bootstrap": "../../../lib/enketo-core/lib/bootstrap",
                                 "jquery": "../../../lib/bower-components/jquery/dist/jquery",
                                 "file-saver": "../../../../test/mock/file-saver.mock",
diff --git a/public/src/js/module/gui.js b/public/src/js/module/gui.js
index 9f8b71a0..9ed34cdf 100755
--- a/public/src/js/module/gui.js
+++ b/public/src/js/module/gui.js
@@ -320,7 +320,7 @@ define( [ 'enketo-js/support', 'settings', 'print', 'jquery', 'plugin', 'bootstr
     function feedback( message, duration, heading, choices ) {
         heading = heading || 'Information';
         //if ($('header').css('position') === 'fixed'){
-        if ( !Modernizr.touch ) {
+        if ( !support.touch ) {
             feedbackBar.show( message, duration );
         }
         //a more obtrusive message is shown
diff --git a/public/src/js/require-config.js b/public/src/js/require-config.js
index cc70a539..f014cd82 100644
--- a/public/src/js/require-config.js
+++ b/public/src/js/require-config.js
@@ -42,9 +42,6 @@ require.config( {
             deps: [ "jquery" ],
             exports: "jQuery.fn.timepicker"
         },
-        "Modernizr": {
-            exports: "Modernizr"
-        },
         "file-saver": {
             exports: "saveAs"
         },