diff --git a/editions/free/src/app.bundle.js.map b/editions/free/src/app.bundle.js.map
new file mode 120000
index 0000000..5376e7f
--- /dev/null
+++ b/editions/free/src/app.bundle.js.map
@@ -0,0 +1 @@
+../../../src/build/bundles/app.bundle.js.map
\ No newline at end of file
diff --git a/src/entry/index.js b/src/entry/index.js
index 32bccb2..501c091 100644
--- a/src/entry/index.js
+++ b/src/entry/index.js
@@ -53,7 +53,6 @@ function indexFirstTime () {
         iOS.hidesplash(doit);
     }, 500);
     function doit () {
-        ScratchAudio.sndFX('tap.wav');
         window.ontouchend = function () {
             indexLoadOptions();
         };
@@ -88,13 +87,6 @@ function indexLoadOptions () {
 }
 
 function indexGohome () {
-    // On iOS, sounds are loaded async, but the code as written expects to play tap.wav when we enter home.html
-    // (but since it isn't loaded yet, no sound is played).
-    // On Android, sync sounds means both calls to tap.wav result in a sound play.
-    // XXX: we should re-write the lobby loading to wait for the sounds to load, and not play a sound here.
-    if (isiOS) {
-        ScratchAudio.sndFX('tap.wav');
-    }
     iOS.setfile('homescroll.sjr', 0, function () {
         doNext();
     });
diff --git a/src/iPad/iOS.js b/src/iPad/iOS.js
index 0a31f94..7c028ec 100644
--- a/src/iPad/iOS.js
+++ b/src/iPad/iOS.js
@@ -185,7 +185,6 @@ export default class iOS {
 
         static registerSound (dir, name, fcn) {
             var result = tabletInterface.io_registersound(dir, name);
-            console.log(result);
             if (fcn) {
                 fcn(result);
             }
@@ -194,7 +193,6 @@ export default class iOS {
 
     static playSound (name, fcn) {
         var result = tabletInterface.io_playsound(name);
-        console.log(result); // eslint-disable-line no-console
         if (fcn) {
             fcn(result);
         }
@@ -210,8 +208,6 @@ export default class iOS {
     // Web Wiew delegate call backs
 
     static soundDone (name) {
-        console.log('soundDone callback, id:', name); // eslint-disable-line no-console
-
         ScratchAudio.soundDone(name);
     }
 
diff --git a/src/utils/Sound.js b/src/utils/Sound.js
index 4ba052d..1d7aba9 100644
--- a/src/utils/Sound.js
+++ b/src/utils/Sound.js
@@ -1,5 +1,5 @@
 import {isAndroid} from './lib';
-import ScratchAudio from './ScratchAudio';
+import iOS from '../iPad/iOS';
 
 export default class Sound {
     constructor (name, time) {