diff --git a/src/helpers/buildAudio.js b/src/helpers/buildAudio.js
index 57add41a3..d5ea6fc36 100644
--- a/src/helpers/buildAudio.js
+++ b/src/helpers/buildAudio.js
@@ -1,15 +1,8 @@
-/* eslint-disable */
-const firefox = /firefox/i;
-const opera = /opera/i;
-const chrome = /chrome/i;
-
 export function testIfSupported(ayah, agent) {
   const { audio } = ayah;
 
-  const testOperaOrFirefox = __SERVER__ ?
-    (agent.isOpera || agent.isFirefox) :
-    (opera.test(window.navigator.userAgent) || firefox.test(window.navigator.userAgent));
-  const testChrome = __SERVER__ ? agent.isChrome : chrome.test(window.navigator.userAgent);
+  const testOperaOrFirefox = (agent.isOpera || agent.isFirefox);
+  const testChrome = agent.isChrome;
 
   if(!audio) {
     return false;
@@ -42,10 +35,9 @@ export function buildAudioForAyah(audio, agent) {
 
   scopedAudio.preload = 'none';
 
-  const testOperaOrFirefox = __SERVER__ ?
-    (agent.isOpera || agent.isFirefox) :
-    (opera.test(window.navigator.userAgent) || firefox.test(window.navigator.userAgent));
-  const testChrome = __SERVER__ ? agent.isChrome : chrome.test(window.navigator.userAgent);
+  const testOperaOrFirefox = (agent.isOpera || agent.isFirefox);
+  const testChrome = agent.isChrome;
+
 
   if (testOperaOrFirefox) {
     if (audio.ogg.url) {
@@ -89,10 +81,6 @@ export default function buildAudio(ayahs) {
     return;
   }
 
-  // const errorMessage = 'The current reciter does not have audio that suits' +
-  //                   ' your browser. Either select another reciter or try' +
-  //                   ' on another browser.';
-
   return ayahs.map(ayah => {
     return buildAudioForAyah(ayah);
   });
diff --git a/src/redux/modules/surahs.js b/src/redux/modules/surahs.js
index f34096cf9..0eccba0ee 100644
--- a/src/redux/modules/surahs.js
+++ b/src/redux/modules/surahs.js
@@ -28,8 +28,10 @@ export default function reducer(state = initialState, action = {}) {
         ...state,
         loaded: true,
         errored: false,
-        entities: Object.assign({}, state.entities, action.result.entities.surahs),
-        result: Object.assign({}, state.result, action.result.result)
+        entities: {
+          ...state.entities,
+          ...action.result.entities.surahs
+        },
       };
     case LOAD_FAIL:
       console.log(action);