diff --git a/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp b/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
index bcabb06c..01ac7a9e 100644
--- a/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
+++ b/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
@@ -1,12 +1,15 @@
 <%@ page import="org.apache.commons.lang3.StringUtils" %>
+<%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page import="org.labkey.api.security.permissions.DeletePermission" %>
 <%@ page import="org.labkey.api.security.permissions.InsertPermission" %>
 <%@ page import="org.labkey.api.settings.AppProps" %>
+<%@ page import="org.labkey.api.util.DOM" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.SafeToRender" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.skylinetoolsstore.RatingManager" %>
 <%@ page import="org.labkey.skylinetoolsstore.SkylineToolsStoreController" %>
 <%@ page import="org.labkey.skylinetoolsstore.SkylineToolsStoreManager" %>
@@ -17,19 +20,14 @@
 <%@ page import="java.text.DateFormat" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Arrays" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
-<%@ page import="java.util.Arrays" %>
-<%@ page import="org.labkey.api.portal.ProjectUrls" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.api.util.DOM" %>
 <%@ page import="static org.labkey.api.util.DOM.IMG" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.src" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.alt" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -46,7 +44,7 @@
 <link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">
 
 <%
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     final SkylineTool tool = (SkylineTool)me.getModelBean();
     final boolean admin = getUser().hasSiteAdminPermission();
 
diff --git a/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp b/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
index b22ff3e8..df63e815 100644
--- a/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
+++ b/SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
@@ -34,7 +34,7 @@
 <link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">
 
 <%
-    JspView<?> me = (JspView<?>)HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     List<SkylineTool> tools = (List<SkylineTool>)me.getModelBean();
 
     final boolean admin = getUser().hasSiteAdminPermission();
diff --git a/lincs/src/org/labkey/lincs/view/customGCTForm.jsp b/lincs/src/org/labkey/lincs/view/customGCTForm.jsp
index 1ff8ca99..b20d9205 100644
--- a/lincs/src/org/labkey/lincs/view/customGCTForm.jsp
+++ b/lincs/src/org/labkey/lincs/view/customGCTForm.jsp
@@ -19,6 +19,7 @@
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.lincs.LincsController" %>
+<%@ page import="org.labkey.lincs.LincsController.CustomGCTBean" %>
 <%@ page import="java.util.List" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -32,8 +33,8 @@
     }
 %>
 <%
-    JspView<LincsController.CustomGCTBean> jspView = (JspView<LincsController.CustomGCTBean>) HttpView.currentView();
-    LincsController.CustomGCTBean bean = jspView.getModelBean();
+    JspView<CustomGCTBean> jspView = HttpView.currentView();
+    CustomGCTBean bean = jspView.getModelBean();
     LincsController.CustomGCTForm form = bean.getForm();
     List<LincsController.SelectedAnnotation> annotations = bean.getAnnotations();
 %>
diff --git a/lincs/src/org/labkey/lincs/view/downloadCustomGCT.jsp b/lincs/src/org/labkey/lincs/view/downloadCustomGCT.jsp
index 2cf98ce9..aedadd88 100644
--- a/lincs/src/org/labkey/lincs/view/downloadCustomGCT.jsp
+++ b/lincs/src/org/labkey/lincs/view/downloadCustomGCT.jsp
@@ -38,7 +38,7 @@
     }
 %>
 <%
-    JspView<CustomGCTForm> jspView = (JspView<CustomGCTForm>) HttpView.currentView();
+    JspView<CustomGCTForm> jspView = HttpView.currentView();
     CustomGCTForm form = jspView.getModelBean();
     List<SelectedAnnotation> annotations = form.getSelectedAnnotationValues();
     GctBean gctBean = form.getCustomGctBean();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp
index ecb0a195..6b8e6ff7 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp
@@ -1,11 +1,11 @@
+<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
-<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.panoramapublic.proteomexchange.ChemElement" %>
 <%@ page import="org.labkey.panoramapublic.proteomexchange.Formula" %>
+<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
 <%@ page import="java.util.Map" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -18,7 +18,7 @@
     }
 %>
 <%
-    JspView<PanoramaPublicController.CombinationModificationBean> view = (JspView<PanoramaPublicController.CombinationModificationBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.CombinationModificationBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     var form = bean.getForm();
     var modification = bean.getModification();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/confirmPostMessage.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/confirmPostMessage.jsp
index a2bf8a28..8075051c 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/confirmPostMessage.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/confirmPostMessage.jsp
@@ -1,12 +1,12 @@
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
-<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.util.StringUtilsLabKey" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
+<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.MessageExampleBean" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
-<%@ page import="org.labkey.api.util.StringUtilsLabKey" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<PanoramaPublicController.MessageExampleBean> view = (JspView<PanoramaPublicController.MessageExampleBean>) HttpView.currentView();
+    JspView<MessageExampleBean> view = HttpView.currentView();
     var messageExample = view.getModelBean();
     var exampleExpAnnot = messageExample.getExperimentAnnotations();
     var exampleShortUrl = exampleExpAnnot.getShortUrl().renderShortURL();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp
index 501cc664..a2b1f056 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp
@@ -16,9 +16,10 @@
      */
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
-<%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
+<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PanoramaPublicMessageForm" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicNotification" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
@@ -43,7 +44,7 @@
     }
 </script>
 <%
-    JspView<PanoramaPublicController.PanoramaPublicMessageForm> view = (JspView<PanoramaPublicController.PanoramaPublicMessageForm>) HttpView.currentView();
+    JspView<PanoramaPublicMessageForm> view = HttpView.currentView();
     var form = view.getModelBean();
 %>
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp
index 6b6a1010..fd2449ab 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp
@@ -16,7 +16,7 @@
     }
 %>
 <%
-    JspView<PanoramaPublicController.SpecLibInfoBean> view = (JspView<PanoramaPublicController.SpecLibInfoBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.SpecLibInfoBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     var form = bean.getForm();
     var library = bean.getLibrary();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/experimentDetails.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/experimentDetails.jsp
index 12028591..3458eb4f 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/experimentDetails.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/experimentDetails.jsp
@@ -16,6 +16,10 @@
  */
 %>
 <%@ page import="org.apache.commons.lang3.StringUtils" %>
+<%@ page import="org.labkey.api.security.permissions.AdminPermission" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
+<%@ page import="org.labkey.api.util.DOM" %>
+<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -24,29 +28,25 @@
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.ExperimentAnnotationsDetails" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.ShowExperimentAnnotationsAction" %>
+<%@ page import="org.labkey.panoramapublic.datacite.DataCiteService" %>
+<%@ page import="org.labkey.panoramapublic.model.CatalogEntry" %>
 <%@ page import="org.labkey.panoramapublic.model.DataLicense" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.model.Journal" %>
-<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="org.labkey.panoramapublic.model.Submission" %>
 <%@ page import="org.labkey.panoramapublic.model.JournalSubmission" %>
-<%@ page import="org.labkey.api.security.permissions.AdminPermission" %>
-<%@ page import="org.labkey.panoramapublic.query.DataValidationManager" %>
+<%@ page import="org.labkey.panoramapublic.model.Submission" %>
 <%@ page import="org.labkey.panoramapublic.model.validation.DataValidation" %>
-<%@ page import="org.labkey.panoramapublic.model.validation.PxStatus" %>
-<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="static org.labkey.api.util.DOM.SPAN" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.style" %>
-<%@ page import="org.labkey.api.util.DOM" %>
+<%@ page import="org.labkey.panoramapublic.model.validation.PxStatus" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.title" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.href" %>
+<%@ page import="org.labkey.panoramapublic.proteomexchange.ProteomeXchangeService" %>
 <%@ page import="org.labkey.panoramapublic.query.CatalogEntryManager" %>
+<%@ page import="org.labkey.panoramapublic.query.DataValidationManager" %>
+<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
 <%@ page import="org.labkey.panoramapublic.view.publish.CatalogEntryWebPart" %>
-<%@ page import="org.labkey.panoramapublic.model.CatalogEntry" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.panoramapublic.proteomexchange.ProteomeXchangeService" %>
-<%@ page import="org.labkey.panoramapublic.datacite.DataCiteService" %>
+<%@ page import="java.text.SimpleDateFormat" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -65,7 +65,7 @@
 %>
 
 <%
-    JspView<ExperimentAnnotationsDetails> me = (JspView<ExperimentAnnotationsDetails>) HttpView.currentView();
+    JspView<ExperimentAnnotationsDetails> me = HttpView.currentView();
     ExperimentAnnotationsDetails annotDetails = me.getModelBean();
     ExperimentAnnotations annot = annotDetails.getExperimentAnnotations();
     ActionURL editUrl = PanoramaPublicController.getEditExperimentDetailsURL(getContainer(), annot.getId(),
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/catalogEntryForm.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/catalogEntryForm.jsp
index a6814367..9c97b079 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/catalogEntryForm.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/catalogEntryForm.jsp
@@ -17,6 +17,9 @@
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page import="org.apache.commons.io.FileUtils" %>
+<%@ page import="org.labkey.api.data.ContainerManager" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
+<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -24,9 +27,6 @@
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.panoramapublic.catalog.CatalogEntrySettings" %>
 <%@ page import="org.labkey.panoramapublic.query.CatalogEntryManager" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
-<%@ page import="org.labkey.api.data.ContainerManager" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%!
     @Override
@@ -39,7 +39,7 @@
     }
 %>
 <%
-    JspView<PanoramaPublicController.CatalogEntryBean> view = (JspView<PanoramaPublicController.CatalogEntryBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.CatalogEntryBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     var form = bean.getForm();
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmPublish.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmPublish.jsp
index 4646604c..781a6288 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmPublish.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmPublish.jsp
@@ -1,9 +1,9 @@
+<%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
-<%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -17,7 +17,7 @@
 
 <labkey:errors/>
 <%
-    JspView<PanoramaPublicController.PublicationDetailsBean> me = (JspView<PanoramaPublicController.PublicationDetailsBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.PublicationDetailsBean> me = HttpView.currentView();
     var bean = me.getModelBean();
     var form = bean.getForm();
 %>
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmSubmit.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmSubmit.jsp
index 546eb3fc..25c3eb76 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmSubmit.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/confirmSubmit.jsp
@@ -39,7 +39,7 @@
 
 <labkey:errors/>
 <%
-    JspView<PanoramaPublicController.PanoramaPublicRequest> me = (JspView<PanoramaPublicController.PanoramaPublicRequest>) HttpView.currentView();
+    JspView<PanoramaPublicController.PanoramaPublicRequest> me = HttpView.currentView();
     PanoramaPublicController.PanoramaPublicRequest bean = me.getModelBean();
     PanoramaPublicController.PublishExperimentForm form = bean.getForm();
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/copyExperimentForm.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/copyExperimentForm.jsp
index 02d6fbf9..9b957e5b 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/copyExperimentForm.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/copyExperimentForm.jsp
@@ -30,9 +30,9 @@
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.GetPxActionsAction" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.model.Journal" %>
-<%@ page import="org.labkey.panoramapublic.query.ExperimentAnnotationsManager" %>
-<%@ page import="org.labkey.panoramapublic.model.Submission" %>
 <%@ page import="org.labkey.panoramapublic.model.JournalSubmission" %>
+<%@ page import="org.labkey.panoramapublic.model.Submission" %>
+<%@ page import="org.labkey.panoramapublic.query.ExperimentAnnotationsManager" %>
 <%@ page import="static org.labkey.panoramapublic.PanoramaPublicController.*" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -47,7 +47,7 @@
 %>
 
 <%
-    JspView<CopyExperimentBean> me = (JspView<CopyExperimentBean>) HttpView.currentView();
+    JspView<CopyExperimentBean> me = HttpView.currentView();
     var bean = me.getModelBean();
     CopyExperimentForm form = bean.getForm();
     ExperimentAnnotations expAnnot = form.lookupExperiment();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/createJournalGroup.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/createJournalGroup.jsp
index 8bc3d038..e71013aa 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/createJournalGroup.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/createJournalGroup.jsp
@@ -1,6 +1,3 @@
-<%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%
 /*
  * Copyright (c) 2014-2019 LabKey Corporation
@@ -18,10 +15,13 @@
  * limitations under the License.
  */
 %>
+<%@ page import="org.labkey.api.view.HttpView" %>
+<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.CreateJournalGroupForm" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<PanoramaPublicController.CreateJournalGroupForm> view = (JspView<PanoramaPublicController.CreateJournalGroupForm>) HttpView.currentView();
-    PanoramaPublicController.CreateJournalGroupForm form = view.getModelBean();
+    JspView<CreateJournalGroupForm> view = HttpView.currentView();
+    CreateJournalGroupForm form = view.getModelBean();
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/dataDownloadInfo.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/dataDownloadInfo.jsp
index a49b1314..5e254844 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/dataDownloadInfo.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/dataDownloadInfo.jsp
@@ -1,16 +1,15 @@
-<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
-<%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
 <%@ page import="org.labkey.api.files.FileContentService" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
 <%@ page import="org.labkey.api.targetedms.TargetedMSService" %>
+<%@ page import="org.labkey.api.view.HttpView" %>
+<%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.webdav.WebdavService" %>
+<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <labkey:errors/>
 <%
-    JspView<JournalManager.PublicDataUser> me = (JspView<JournalManager.PublicDataUser>) HttpView.currentView();
+    JspView<JournalManager.PublicDataUser> me = HttpView.currentView();
     var publicDataUser = me.getModelBean();
     // NOTE: This is a link to the data download documentation page on PanoramaWeb.  It will not work on any other server.
     var downloadDataDocHref = "/home/wiki-page.view?name=download_public_data";
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/missingMetadata.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/missingMetadata.jsp
index 6e6c0a26..6d25ea6d 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/missingMetadata.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/missingMetadata.jsp
@@ -19,8 +19,8 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
+<%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.query.DataValidationManager" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -34,7 +34,7 @@
 
 <labkey:errors/>
 <%
-    JspView<PanoramaPublicController.MissingMetadataBean> me = (JspView<PanoramaPublicController.MissingMetadataBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.MissingMetadataBean> me = HttpView.currentView();
     PanoramaPublicController.MissingMetadataBean bean = me.getModelBean();
     DataValidationManager.MissingMetadata missingMetadata = bean.getMissingMetadata();
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publicationDetails.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publicationDetails.jsp
index 5168375a..aede21ec 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publicationDetails.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publicationDetails.jsp
@@ -1,9 +1,9 @@
+<%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
-<%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -17,7 +17,7 @@
 
 <labkey:errors/>
 <%
-    JspView<PanoramaPublicController.PublicationDetailsBean> me = (JspView<PanoramaPublicController.PublicationDetailsBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.PublicationDetailsBean> me = HttpView.currentView();
     var bean = me.getModelBean();
     var form = bean.getForm();
 %>
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishExperimentForm.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishExperimentForm.jsp
index 23761ef1..8dbd9378 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishExperimentForm.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishExperimentForm.jsp
@@ -29,12 +29,12 @@
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PublishExperimentForm" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PublishExperimentFormBean" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController.ResubmitExperimentAction" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.UpdateSubmissionAction" %>
 <%@ page import="org.labkey.panoramapublic.model.DataLicense" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.model.Journal" %>
 <%@ page import="org.labkey.panoramapublic.query.ExperimentAnnotationsManager" %>
 <%@ page import="java.util.Set" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.UpdateSubmissionAction" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -48,7 +48,7 @@
 
 <labkey:errors/>
 <%
-    JspView<PublishExperimentFormBean> me = (JspView<PublishExperimentFormBean>) HttpView.currentView();
+    JspView<PublishExperimentFormBean> me = HttpView.currentView();
     PublishExperimentFormBean bean = me.getModelBean();
     PublishExperimentForm form = bean.getForm();
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishSuccessView.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishSuccessView.jsp
index 0486d6db..3846290a 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishSuccessView.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/publishSuccessView.jsp
@@ -1,4 +1,7 @@
+<%@ page import="org.labkey.api.data.ContainerManager" %>
 <%@ page import="org.labkey.api.portal.ProjectUrls" %>
+<%@ page import="org.labkey.api.settings.AppProps" %>
+<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
 <%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -6,9 +9,6 @@
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.query.CatalogEntryManager" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
-<%@ page import="org.labkey.api.data.ContainerManager" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -23,7 +23,7 @@
 %>
 
 <%
-    JspView<PanoramaPublicController.PublishSuccessViewBean> me = (JspView<PanoramaPublicController.PublishSuccessViewBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.PublishSuccessViewBean> me = HttpView.currentView();
     var bean = me.getModelBean();
     ExperimentAnnotations copiedExperiment = bean.getCopiedExperiment();
     boolean canAddCatalogEntry = CatalogEntryManager.getCatalogEntrySettings().isEnabled() && CatalogEntryManager.getEntryForExperiment(copiedExperiment) == null;
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxActions.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxActions.jsp
index 79a1ffe4..9a13599b 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxActions.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxActions.jsp
@@ -39,7 +39,7 @@
 %>
 
 <%
-    JspView<PanoramaPublicController.PxActionsForm> me = (JspView<PanoramaPublicController.PxActionsForm>) HttpView.currentView();
+    JspView<PanoramaPublicController.PxActionsForm> me = HttpView.currentView();
     PanoramaPublicController.PxActionsForm bean = me.getModelBean();
     ExperimentAnnotations expAnnot = bean.lookupExperiment();
 %>
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxMissingFiles.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxMissingFiles.jsp
index e7f55c68..28058957 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxMissingFiles.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxMissingFiles.jsp
@@ -1,10 +1,10 @@
+<%@ page import="org.json.JSONObject" %>
+<%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PxValidationStatusBean" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.model.validation.Status" %>
-<%@ page import="org.json.JSONObject" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%!
@@ -19,7 +19,7 @@
 <labkey:errors/>
 
 <%
-    var view = (JspView<PanoramaPublicController.PxValidationStatusBean>) HttpView.currentView();
+    JspView<PxValidationStatusBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     ExperimentAnnotations experimentAnnotations = bean.getExpAnnotations();
     int experimentAnnotationsId = experimentAnnotations.getId();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationRunning.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationRunning.jsp
index 42757b59..c924f9dd 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationRunning.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationRunning.jsp
@@ -1,11 +1,12 @@
-<%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
+<%@ page import="org.labkey.api.pipeline.PipelineJob" %>
 <%@ page import="org.labkey.api.pipeline.PipelineStatusUrls" %>
+<%@ page import="org.labkey.api.util.PageFlowUtil" %>
+<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.api.pipeline.PipelineJob" %>
+<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PxValidationStatusBean" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%!
@@ -17,7 +18,7 @@
 %>
 <labkey:errors/>
 <%
-    var view = (JspView<PanoramaPublicController.PxValidationStatusBean>) HttpView.currentView();
+    JspView<PxValidationStatusBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     int jobId = bean.getDataValidation().getJobId();
     var jobStatus = bean.getPipelineJobStatus();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationStatus.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationStatus.jsp
index f0cc7725..50bbba34 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationStatus.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/pxValidationStatus.jsp
@@ -4,6 +4,7 @@
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PxValidationStatusBean" %>
 <%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
 <%@ page import="org.labkey.panoramapublic.model.Submission" %>
 <%@ page import="org.labkey.panoramapublic.model.validation.Status" %>
@@ -22,7 +23,7 @@
 <labkey:errors/>
 
 <%
-    var view = (JspView<PanoramaPublicController.PxValidationStatusBean>) HttpView.currentView();
+    JspView<PxValidationStatusBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     ExperimentAnnotations experimentAnnotations = bean.getExpAnnotations();
     int experimentAnnotationsId = experimentAnnotations.getId();
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
index 6212caf0..0ace61ae 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
@@ -16,13 +16,13 @@
  */
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.api.protein.search.PeptideSearchForm" %>
 <%@ page import="org.labkey.api.protein.ProteinService" %>
+<%@ page import="org.labkey.api.protein.search.PeptideSearchForm" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<PeptideSearchForm> me = (JspView<PeptideSearchForm>) HttpView.currentView();
+    JspView<PeptideSearchForm> me = HttpView.currentView();
     PeptideSearchForm model = me.getModelBean();
 %>
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
index be2e5475..429fd71f 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
@@ -22,7 +22,7 @@
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<ProteinSearchForm> me = (JspView<ProteinSearchForm>) HttpView.currentView();
+    JspView<ProteinSearchForm> me = HttpView.currentView();
     ProteinSearchForm bean = me.getModelBean();
 %>
 <labkey:form action="<%=ProteinService.get().getProteinSearchUrl(getContainer())%>">
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/unimodMatchInfo.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/unimodMatchInfo.jsp
index 128b05cd..8d9c2b98 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/unimodMatchInfo.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/unimodMatchInfo.jsp
@@ -1,10 +1,10 @@
+<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
-<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
+<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
 <%@ page import="org.labkey.panoramapublic.proteomexchange.Formula" %>
+<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -16,7 +16,7 @@
     }
 %>
 <%
-    JspView<PanoramaPublicController.UnimodMatchBean> view = (JspView<PanoramaPublicController.UnimodMatchBean>) HttpView.currentView();
+    JspView<PanoramaPublicController.UnimodMatchBean> view = HttpView.currentView();
     var bean = view.getModelBean();
     var form = bean.getForm();
     var modification = bean.getModification();
diff --git a/signup/src/org/labkey/signup/SignUpAdmin.jsp b/signup/src/org/labkey/signup/SignUpAdmin.jsp
index 4c300faa..b1757893 100644
--- a/signup/src/org/labkey/signup/SignUpAdmin.jsp
+++ b/signup/src/org/labkey/signup/SignUpAdmin.jsp
@@ -31,7 +31,7 @@
 %>
 
 <%
-    JspView<User> me = (JspView<User>) HttpView.currentView();
+    JspView<User> me = HttpView.currentView();
     User data = me.getModelBean();
     List<Container> list = ContainerManager.getAllChildren(ContainerManager.getRoot(),data);
     Map<String, Object> m = new HashMap<>(); // Map of containers to available security groups in the container.
diff --git a/testresults/src/org/labkey/testresults/view/errorFiles.jsp b/testresults/src/org/labkey/testresults/view/errorFiles.jsp
index 372826d2..015d84aa 100644
--- a/testresults/src/org/labkey/testresults/view/errorFiles.jsp
+++ b/testresults/src/org/labkey/testresults/view/errorFiles.jsp
@@ -1,12 +1,8 @@
-<%@ page import="org.labkey.api.data.Container" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.testresults.TestResultsController" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="java.io.File" %>
 <%@ page import="java.nio.file.Files" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -23,7 +19,7 @@
      * User: Yuval Boss, yuval(at)uw.edu
      * Date: 10/05/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     File[] errorFiles = (File[])me.getModelBean();
     Container c = getContainer();
 %>
diff --git a/testresults/src/org/labkey/testresults/view/failureDetail.jsp b/testresults/src/org/labkey/testresults/view/failureDetail.jsp
index e6b756a7..e5986926 100644
--- a/testresults/src/org/labkey/testresults/view/failureDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/failureDetail.jsp
@@ -2,6 +2,7 @@
 <%@ page import="org.json.JSONObject" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
 <%@ page import="org.labkey.testresults.model.RunProblems" %>
 <%@ page import="org.labkey.testresults.model.TestFailDetail" %>
@@ -17,7 +18,6 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.TreeMap" %>
 <%@ page import="java.util.stream.Collectors" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -39,7 +39,7 @@
       User: Yuval Boss, yuval(at)uw.edu
       Date: 10/05/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
     final String contextPath = AppProps.getInstance().getContextPath();
     String failedTest = getViewContext().getRequest().getParameter("failedTest");
diff --git a/testresults/src/org/labkey/testresults/view/flagged.jsp b/testresults/src/org/labkey/testresults/view/flagged.jsp
index 68fcd234..98b87de7 100644
--- a/testresults/src/org/labkey/testresults/view/flagged.jsp
+++ b/testresults/src/org/labkey/testresults/view/flagged.jsp
@@ -1,11 +1,11 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.testresults.TestResultsController.ShowRunAction" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
 <%@ page import="org.labkey.testresults.view.TestsDataBean" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="java.util.Collections" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -21,7 +21,7 @@
       User: Yuval Boss, yuval(at)uw.edu
       Date: 10/05/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
 %>
 
diff --git a/testresults/src/org/labkey/testresults/view/longTerm.jsp b/testresults/src/org/labkey/testresults/view/longTerm.jsp
index 57cb7d3d..894119b1 100644
--- a/testresults/src/org/labkey/testresults/view/longTerm.jsp
+++ b/testresults/src/org/labkey/testresults/view/longTerm.jsp
@@ -11,7 +11,7 @@
      * User: Yuval Boss, yuval(at)uw.edu
      * Date: 1/14/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     LongTermBean data = (LongTermBean)me.getModelBean();
     final String contextPath = AppProps.getInstance().getContextPath();
     String viewType = data.getViewType();
diff --git a/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp b/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
index 79d3dfc4..e21b8222 100644
--- a/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
@@ -22,7 +22,7 @@
      * User: Yuval Boss, yuval(at)uw.edu
      * Date: 10/05/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
     final String contextPath = AppProps.getInstance().getContextPath();
     String viewType = data.getViewType();
diff --git a/testresults/src/org/labkey/testresults/view/runDetail.jsp b/testresults/src/org/labkey/testresults/view/runDetail.jsp
index ed5bed9d..73e1e026 100644
--- a/testresults/src/org/labkey/testresults/view/runDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/runDetail.jsp
@@ -1,16 +1,16 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
 <%@ page import="org.labkey.testresults.model.TestFailDetail" %>
-<%@ page import="org.labkey.testresults.model.TestLeakDetail" %>
 <%@ page import="org.labkey.testresults.model.TestHandleLeakDetail" %>
+<%@ page import="org.labkey.testresults.model.TestLeakDetail" %>
 <%@ page import="org.labkey.testresults.model.TestMemoryLeakDetail" %>
 <%@ page import="org.labkey.testresults.model.TestPassDetail" %>
 <%@ page import="org.labkey.testresults.view.TestsDataBean" %>
 <%@ page import="java.text.DateFormat" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Arrays" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -30,7 +30,7 @@
       User: Yuval Boss, yuval(at)uw.edu
       Date: 1/14/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
     Container c = getContainer();
     final String contextPath = AppProps.getInstance().getContextPath();
diff --git a/testresults/src/org/labkey/testresults/view/rundown.jsp b/testresults/src/org/labkey/testresults/view/rundown.jsp
index a2958101..cd91931d 100644
--- a/testresults/src/org/labkey/testresults/view/rundown.jsp
+++ b/testresults/src/org/labkey/testresults/view/rundown.jsp
@@ -1,6 +1,8 @@
 <%@ page import="org.json.JSONObject" %>
+<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.testresults.TestResultsController.ShowRunAction" %>
 <%@ page import="org.labkey.testresults.model.BackgroundColor" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
@@ -13,11 +15,9 @@
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="java.util.Date" %>
+<%@ page import="static org.labkey.testresults.TestResultsModule.ViewType" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
-<%@ page import="static org.labkey.testresults.TestResultsModule.ViewType" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -47,7 +47,7 @@
       User: Yuval Boss, yuval(at)uw.edu
       Date: 1/14/2015
      */
-    JspView<?> me = (JspView<?>)HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     RunDownBean data = (RunDownBean)me.getModelBean();
     DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
 
diff --git a/testresults/src/org/labkey/testresults/view/trainingdata.jsp b/testresults/src/org/labkey/testresults/view/trainingdata.jsp
index 6a208d42..5a236c3f 100644
--- a/testresults/src/org/labkey/testresults/view/trainingdata.jsp
+++ b/testresults/src/org/labkey/testresults/view/trainingdata.jsp
@@ -1,18 +1,13 @@
-<%@ page import="org.labkey.api.data.Container" %>
-<%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.testresults.view.TestsDataBean" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.api.settings.AppProps" %>
-<%@ page import="org.labkey.testresults.model.User" %>
+<%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
+<%@ page import="org.labkey.testresults.SendTestResultsEmail" %>
+<%@ page import="org.labkey.testresults.model.BackgroundColor" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
-<%@ page import="org.labkey.testresults.TestResultsController" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
+<%@ page import="org.labkey.testresults.model.User" %>
+<%@ page import="org.labkey.testresults.view.TestsDataBean" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.List" %>
-<%@ page import="org.labkey.testresults.SendTestResultsEmail" %>
-<%@ page import="org.labkey.testresults.model.BackgroundColor" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%!
@@ -31,7 +26,7 @@
      * User: Yuval Boss, yuval(at)uw.edu
      * Date: 1/14/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
     User[] users = data.getUsers();
     RunDetail[] runs = data.getRuns();
diff --git a/testresults/src/org/labkey/testresults/view/user.jsp b/testresults/src/org/labkey/testresults/view/user.jsp
index d06addf4..a392f80a 100644
--- a/testresults/src/org/labkey/testresults/view/user.jsp
+++ b/testresults/src/org/labkey/testresults/view/user.jsp
@@ -1,6 +1,7 @@
 <%@ page import="org.json.JSONObject" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.testresults.TestResultsController.ShowRunAction" %>
 <%@ page import="org.labkey.testresults.model.RunDetail" %>
 <%@ page import="org.labkey.testresults.model.User" %>
@@ -16,7 +17,6 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.TreeMap" %>
 <%@ page import="java.util.TreeSet" %>
-<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 
@@ -42,7 +42,7 @@
      * User: Yuval Boss, yuval(at)uw.edu
      * Date: 1/14/2015
      */
-    JspView<?> me = (JspView<?>) HttpView.currentView();
+    JspView<?> me = HttpView.currentView();
     TestsDataBean data = (TestsDataBean)me.getModelBean();
     final String contextPath = AppProps.getInstance().getContextPath();