--- a/viewer/viewer.html	2013-01-24 11:17:55.000000000 +0100
+++ b/viewer/viewer.html	2013-01-24 13:54:20.000000000 +0100
@@ -30,7 +30,7 @@
 <!-- This snippet is used in production, see Makefile -->
 <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
 <script type="text/javascript" src="l10n.js"></script>
-<script type="text/javascript" src="../build/pdf.js"></script>
+<script type="text/javascript" src="pdf.js"></script>
 
 
     <script type="text/javascript" src="debugger.js"></script>
@@ -111,19 +111,9 @@
                   <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
                 </button>
 
-                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="12" data-l10n-id="open_file">
-                   <span data-l10n-id="open_file_label">Open</span>
-                </button>
-
                 <button id="print" class="toolbarButton print" title="Print" tabindex="13" data-l10n-id="print">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
-
-                <button id="download" class="toolbarButton download" title="Download" tabindex="14" data-l10n-id="download">
-                  <span data-l10n-id="download_label">Download</span>
-                </button>
-                <!-- <div class="toolbarButtonSpacer"></div> -->
-                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Current view (copy or open in new window)" tabindex="15" data-l10n-id="bookmark"><span data-l10n-id="bookmark_label">Current View</span></a>
               </div>
               <div class="outerCenter">
                 <div class="innerCenter" id="toolbarViewerMiddle">
--- a/viewer/viewer.js	2013-01-24 11:17:55.000000000 +0100
+++ b/viewer/viewer.js	2013-01-24 13:51:05.000000000 +0100
@@ -17,7 +17,7 @@
 
 'use strict';
 
-var DEFAULT_URL = 'compressed.tracemonkey-pldi-09.pdf';
+var DEFAULT_URL = null;
 var DEFAULT_SCALE = 'auto';
 var DEFAULT_SCALE_DELTA = 1.1;
 var UNKNOWN_SCALE = 0;
@@ -43,7 +43,7 @@
   FIND_PENDING: 3
 };
 
-  PDFJS.workerSrc = '../build/pdf.js';
+  PDFJS.workerSrc = 'pdf.js';
 
 var mozL10n = document.mozL10n || document.webL10n;
 
@@ -2676,7 +2676,7 @@
   var file = params.file || DEFAULT_URL;
 
   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
-    document.getElementById('openFile').setAttribute('hidden', 'true');
+    // document.getElementById('openFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }
@@ -2790,21 +2790,11 @@
       PDFView.fullscreen();
     });
 
-  document.getElementById('openFile').addEventListener('click',
-    function() {
-      document.getElementById('fileInput').click();
-    });
-
   document.getElementById('print').addEventListener('click',
     function() {
       window.print();
     });
 
-  document.getElementById('download').addEventListener('click',
-    function() {
-      PDFView.download();
-    });
-
   document.getElementById('pageNumber').addEventListener('change',
     function() {
       PDFView.page = this.value;
@@ -2899,7 +2889,7 @@
     store.set('scrollTop', Math.round(topLeft[1]));
   });
   var href = PDFView.getAnchorUrl(pdfOpenParams);
-  document.getElementById('viewBookmark').href = href;
+  // document.getElementById('viewBookmark').href = href;
 }
 
 window.addEventListener('resize', function webViewerResize(evt) {
@@ -2933,8 +2923,8 @@
   PDFView.setTitleUsingUrl(file.name);
 
   // URL does not reflect proper document location - hiding some icons.
-  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
-  document.getElementById('download').setAttribute('hidden', 'true');
+  // document.getElementById('viewBookmark').setAttribute('hidden', 'true');
+  // document.getElementById('download').setAttribute('hidden', 'true');
 }, true);
 
 function selectScaleOption(value) {