diff --git a/install/idemiaawppkcs11-mac.json b/install/idemiaawppkcs11-mac.json
deleted file mode 100644
index c00fb74e..00000000
--- a/install/idemiaawppkcs11-mac.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "idemiaawppkcs11",
-  "description": "IDEMIA AWP PKCS#11 Module",
-  "type": "pkcs11",
-  "path": "/Library/AWP/lib/libOcsPKCS11Wrapper.dylib",
-  "allowed_extensions": ["{02274e0c-d135-45f0-8a9c-32b35110e10d}", "{e68418bc-f2b0-4459-a9ea-3e72b6751b07}"]
-}
diff --git a/install/idemiaawppkcs11-win.json b/install/idemiaawppkcs11-win.json
deleted file mode 100644
index 86110fdd..00000000
--- a/install/idemiaawppkcs11-win.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "idemiaawppkcs11",
-  "description": "IDEMIA AWP PKCS#11 Module",
-  "type": "pkcs11",
-  "path": "C:\\Windows\\System32\\OcsPKCS11Wrapper.dll",
-  "allowed_extensions": ["{02274e0c-d135-45f0-8a9c-32b35110e10d}", "{e68418bc-f2b0-4459-a9ea-3e72b6751b07}"]
-}
diff --git a/install/onepinopenscpkcs11-mac.json b/install/onepinopenscpkcs11-mac.json
deleted file mode 100644
index 3a600dee..00000000
--- a/install/onepinopenscpkcs11-mac.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "onepinopenscpkcs11",
-  "description": "OpenSC PKCS#11 Module",
-  "type": "pkcs11",
-  "path": "/Library/OpenSC/lib/onepin-opensc-pkcs11.so",
-  "allowed_extensions": ["{02274e0c-d135-45f0-8a9c-32b35110e10d}", "{e68418bc-f2b0-4459-a9ea-3e72b6751b07}"]
-}
diff --git a/install/onepinopenscpkcs11-win.json b/install/onepinopenscpkcs11-win.json
deleted file mode 100644
index f4d28c89..00000000
--- a/install/onepinopenscpkcs11-win.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "onepinopenscpkcs11",
-  "description": "OpenSC PKCS#11 Module",
-  "type": "pkcs11",
-  "path": "C:\\Windows\\System32\\onepin-opensc-pkcs11.dll",
-  "allowed_extensions": ["{02274e0c-d135-45f0-8a9c-32b35110e10d}", "{e68418bc-f2b0-4459-a9ea-3e72b6751b07}"]
-}
diff --git a/install/web-eid.wxs b/install/web-eid.wxs
index db59c6bb..446c0099 100644
--- a/install/web-eid.wxs
+++ b/install/web-eid.wxs
@@ -113,17 +113,11 @@
             <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.json"
               Key="SOFTWARE\Google\Chrome\NativeMessagingHosts\eu.webeid"/>
           </Component>
-          <Component Id="Firefox" Transitive="yes" Guid="f60c4395-0952-4bc4-a09e-661341c19d2c">
+          <Component Id="Firefox" Transitive="yes">
             <Condition><![CDATA[(FIREFOXINSTALL = 1)]]></Condition>
             <File Source="$(var.jsonfirefox)"/>
-            <File Source="$(var.install_path)\onepinopenscpkcs11-win.json" Name="onepinopenscpkcs11.json"/>
-            <File Source="$(var.install_path)\idemiaawppkcs11-win.json" Name="idemiaawppkcs11.json"/>
             <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.firefox.json"
               Key="SOFTWARE\Mozilla\NativeMessagingHosts\eu.webeid" />
-            <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]onepinopenscpkcs11.json"
-              Key="Software\Mozilla\PKCS11Modules\onepinopenscpkcs11" />
-            <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]idemiaawppkcs11.json"
-              Key="Software\Mozilla\PKCS11Modules\idemiaawppkcs11" />
           </Component>
 <?ifdef var.qt_path ?>
           <Directory Id="platforms" Name="platforms" FileSource="$(var.qt_path)\..\plugins\platforms">
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 6f23c545..728a8d6d 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -36,7 +36,6 @@ if(WIN32)
         -dqt_suffix="$<$<CONFIG:Debug>:d>"
         -djson=${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
         -djsonfirefox=${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.firefox.json
-        -dinstall_path=${CMAKE_SOURCE_DIR}/install
         -dFIREFOX_URL="${FIREFOX_URL}"
         -dFIREFOX_UUID="${FIREFOX_UUID}"
         -dapp_path=$<TARGET_FILE:web-eid>
@@ -93,10 +92,6 @@ elseif(APPLE)
         DESTINATION "/Library/Google/Chrome/NativeMessagingHosts")
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.firefox.json COMPONENT firefox
         DESTINATION "/Library/Application Support/Mozilla/NativeMessagingHosts" RENAME eu.webeid.json)
-    install(FILES ${CMAKE_SOURCE_DIR}/install/onepinopenscpkcs11-mac.json COMPONENT firefox
-        DESTINATION "/Library/Application Support/Mozilla/PKCS11Modules" RENAME onepinopenscpkcs11.json)
-    install(FILES ${CMAKE_SOURCE_DIR}/install/idemiaawppkcs11-mac.json COMPONENT firefox
-        DESTINATION "/Library/Application Support/Mozilla/PKCS11Modules" RENAME idemiaawppkcs11.json)
     install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json COMPONENT chrome
         DESTINATION "/Library/Application Support/Google/Chrome/External Extensions")
     add_custom_target(macdeployqt DEPENDS web-eid
diff --git a/src/mac/js b/src/mac/js
index 3878139a..46bcac79 160000
--- a/src/mac/js
+++ b/src/mac/js
@@ -1 +1 @@
-Subproject commit 3878139a561f083e44bfba0da8ea9cf0c858a444
+Subproject commit 46bcac79f3de0ba063b33101eabb25555d2f8bea