diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index aa4eb5f228c..4be14f2c682 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -75,9 +75,9 @@
                                     <p:commandButton id="savebutton" class="btn btn-default" value="#{bundle.saveChanges}"
                                                      update=":datasetForm,:messagePanel"
                                                      onclick="PF('blockFileForm').show();"
-                                                     oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
+                                                     oncomplete="$(document).scrollTop(0);"
                                                      action="#{EditDatafilesPage.save}"/>
-                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
+                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form"/>
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
                                     <button id="doneFilesButtonnop" class="btn btn-default" value="#{bundle.done}" onclick="cancelDatasetEdit();return false;">#{bundle.done}</button>
diff --git a/src/main/webapp/file-edit-button-fragment.xhtml b/src/main/webapp/file-edit-button-fragment.xhtml
index fd7d116e63d..4975bc22636 100644
--- a/src/main/webapp/file-edit-button-fragment.xhtml
+++ b/src/main/webapp/file-edit-button-fragment.xhtml
@@ -49,7 +49,7 @@
                 <p:commandLink  onclick="if (!(#{fileMetadata!=null} || testFilesSelected()))
                                             return false;" 
                                 update="@([id$=accessPopup])"            
-                                oncomplete="PF('accessPopup').show();bind_bsui_components();">
+                                oncomplete="PF('accessPopup').show();">
                     <f:setPropertyActionListener target="#{fileMetadataForAction}" value="#{fileMetadata}" />
                     <f:setPropertyActionListener target="#{bean.termsOfAccess}" value="#{datasetVersion.termsOfUseAndAccess.termsOfAccess}" />
                     <f:setPropertyActionListener target="#{bean.fileAccessRequest}" value="#{datasetVersion.termsOfUseAndAccess.fileAccessRequest}" />                     
@@ -110,7 +110,7 @@
         <li>
             <p:commandLink
                 update="@([id$=editProvenancePopup])"
-                oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                oncomplete="PF('editProvenancePopup').show();">
                 <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
                 #{bundle['file.provenance']} 
             </p:commandLink>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index f5232623822..106e6b2387c 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -327,7 +327,7 @@
                     <!-- END Top Button/Citation Blocks -->
                     <div id="contentTabs">
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{FilePage.selectedTabIndex}">
-                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" oncomplete="bind_bsui_components();" update="@this" />
+                            <p:ajax event="tabChange" listener="#{FilePage.tabChanged}" update="@this" />
                             <p:tab id="accessTab" class="padding-none" title="#{bundle['file.dataFilesTab.dataAccess']}"
                                    rendered="#{settingsWrapper.rsyncDownload and FilePage.fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload
                                         and !FilePage.fileMetadata.getDataFile().getOwner().getStorageIdentifier().startsWith('s3://') }">