diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index 5c81140..9c0905b 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -27,7 +27,6 @@
       </label>
       <input type="button" value="Upload firmware" class="inline button btn-primary float-right" ng-click="upload()"/>
       <div class="inline uploading" ng-show="uploading">Upload in progress...</div>
-      <p class="download_success" ng-show="upload_success" role="alert">{{file ? '' : 'Upload complete. Check image tables above.'}}</p>
     </div>
     <div class=" column firmware__upload-tftp">
       <h3 class="h4 bold">Download image file from TFTP server</h3>
@@ -47,29 +46,12 @@
           </div>
         </div>
         <div class="inline uploading" ng-show="downloading">Downloading in progress...</div>
-        <p class="download_error error-msg" ng-show="download_error_msg" role="alert">{{download_error_msg}}</p>
-        <p class="download_success" ng-show="download_success" role="alert">Download complete. Check image tables above.</p>
       </fieldset>
     </div>
   </form>
 </div>
 
 <!-- Firmware modals -->
-<section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': display_error}">
-  <div class="modal__upload-fail" role="document">
-    <div class="screen-reader-offscreen modal-description">{{error.modal_title}}</div><!-- accessibility only; used for screen readers -->
-    <div class="page-header ">
-      <span class="icon icon__warning inline"><span class="accessible-text" role="alert">{{error.type}}</span></span>
-      <h1 class="modal-title h4 inline">{{error.title}}</h1>
-    </div>
-    <div class="modal__content">
-      <p>{{error.desc}}</p>
-    </div>
-    <div class="modal__button-wrapper">
-      <button class="inline btn-primary" ng-click="display_error = false;">Close</button>
-    </div>
-  </div>
-</section>
 
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': confirm_priority}">
   <div class="modal__tftp-unreachable" role="document">
@@ -161,4 +143,4 @@
     </div>
   </div>
 </section>
-<div class="modal-overlay" tabindex="-1" ng-class="{'active': (display_error || activate_confirm)}"></div>
+<div class="modal-overlay" tabindex="-1" ng-class="{'active': (confirm_priority || activate_confirm || confirm_delete)}"></div>