diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index c6bfec6563..02ef4042d5 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -51,14 +51,8 @@
 #
 #= require modernizr
 #
-#= require foundation
 #= require ./darkswarm
 #= require ./overrides
 #= require_tree ./mixins
 #= require_tree ./directives
 #= require_tree .
-
-$ ->
-  # Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
-  Foundation.set_namespace ""
-  $(document).foundation()
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index fec1974e34..5546d49360 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -38,17 +38,12 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
       data.map( (taxon) ->
         $scope.supplied_taxons[taxon.id] = Taxons.taxons_by_id[taxon.id]
       )
-      # Some taxons may be displayed in a dropdown.
-      # Foundation needs initialising again to add dropdown actions.
-      Foundation.init()
+
     OrderCycleResource.properties params, (data)=>
       $scope.supplied_properties = {}
       data.map( (property) ->
         $scope.supplied_properties[property.id] = Properties.properties_by_id[property.id]
       )
-      # Some properties may be displayed in a dropdown.
-      # Foundation needs initialising again to add dropdown actions.
-      Foundation.init()
 
   $scope.loadMore = ->
     if ($scope.page * $scope.per_page) <= Products.products.length
diff --git a/app/views/shared/menu/_language_selector.html.haml b/app/views/shared/menu/_language_selector.html.haml
index 6e91e73165..b35a1a25b0 100644
--- a/app/views/shared/menu/_language_selector.html.haml
+++ b/app/views/shared/menu/_language_selector.html.haml
@@ -1,4 +1,4 @@
-%li.language-switcher.has-dropdown
+%li.language-switcher.has-dropdown.not-click
   %a{href: '#', class: "top-bar--menu-item-with-icon"}
     %i.ofn-i_071-globe
     %span= t 'language_name'
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 8403fd7300..1b48aa6a72 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -1,4 +1,4 @@
-%nav.top-bar.show-for-large-up{'data-topbar' => true}
+%nav.top-bar.show-for-large-up
   %section.top-bar-section
     %ul.nav-logo
       %li.ofn-logo