diff --git a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
index d4bfc869c23..4fd3d7036ec 100644
--- a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
+++ b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
@@ -266,7 +266,7 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws
 
             Input.InputBuilder input = new Input.InputBuilder()
                     .type("file")
-                    .name(getInputPrefix() + formFieldName)
+                    .name(formFieldName)
                     .disabled(isDisabledInput(ctx))
                     .needsWrapping(false);
 
@@ -288,7 +288,6 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws
     /**
      * Enable subclasses to override the warning text
      * @param filename being displayed
-     * @return
      */
     protected String getRemovalWarningText(String filename)
     {
diff --git a/api/src/org/labkey/api/data/DataColumn.java b/api/src/org/labkey/api/data/DataColumn.java
index 62287ca4df1..5f46fbc780c 100644
--- a/api/src/org/labkey/api/data/DataColumn.java
+++ b/api/src/org/labkey/api/data/DataColumn.java
@@ -103,9 +103,7 @@ public DataColumn(ColumnInfo col, boolean withLookups)
         {
             _width = _displayColumn.getWidth();
         }
-        StringExpression url = withLookups ?
-                _boundColumn.getEffectiveURL() :
-                _boundColumn.getURL();
+        StringExpression url = withLookups ? _boundColumn.getEffectiveURL() : _boundColumn.getURL();
         if (null != url)
             super.setURLExpression(url);
         setLinkTarget(_boundColumn.getURLTargetWindow());
@@ -129,7 +127,6 @@ public DataColumn(ColumnInfo col, boolean withLookups)
                 else
                     _inputType = "select";
             }
-
         }
         catch (QueryParseException qpe)
         {
@@ -143,7 +140,6 @@ public DataColumn(ColumnInfo col, boolean withLookups)
         _caption = StringExpressionFactory.create(_boundColumn.getLabel());
         _editable = !_boundColumn.isReadOnly() && _boundColumn.isUserEditable();
         _textAlign = _displayColumn.getTextAlign();
-
     }
 
 
@@ -282,7 +278,7 @@ public void addQueryColumns(Set<ColumnInfo> columns)
     @Override
     public boolean isSortable()
     {
-        return _sortFieldKeys != null && _sortFieldKeys.size() > 0;
+        return _sortFieldKeys != null && !_sortFieldKeys.isEmpty();
     }
 
     @Override
@@ -718,9 +714,9 @@ private void renderSelectFormInput(
     ) throws IOException
     {
         Select.SelectBuilder select = new Select.SelectBuilder()
-                .disabled(disabledInput)
-                .multiple("select.multiple".equalsIgnoreCase(_inputType))
-                .name(getInputPrefix() + formFieldName);
+            .disabled(disabledInput)
+            .multiple("select.multiple".equalsIgnoreCase(_inputType))
+            .name(formFieldName);
 
         List<Option> options = new ArrayList<>();
 
@@ -794,10 +790,10 @@ protected void renderFileFormInput(RenderContext ctx, Writer out, String formFie
             throws IOException
     {
         var input = new Input.InputBuilder<>()
-                .type("file")
-                .name(getInputPrefix() + formFieldName)
-                .disabled(disabledInput)
-                .needsWrapping(false);
+            .type("file")
+            .name(formFieldName)
+            .disabled(disabledInput)
+            .needsWrapping(false);
 
         out.write(input.build().toString());
     }
@@ -808,12 +804,12 @@ protected void renderCheckboxFormInput(RenderContext ctx, Writer out, String for
         boolean checked = ColumnInfo.booleanFromObj(ConvertUtils.convert(value));
 
         var input = new Input.InputBuilder<>()
-                .type("checkbox")
-                .name(getInputPrefix() + formFieldName)
-                .disabled(disabledInput)
-                .value("1")
-                .checked(checked)
-                .needsWrapping(false);
+            .type("checkbox")
+            .name(formFieldName)
+            .disabled(disabledInput)
+            .value("1")
+            .checked(checked)
+            .needsWrapping(false);
 
         out.write(input.build().toString());
 
@@ -838,11 +834,11 @@ protected void renderTextAreaFormInput(RenderContext ctx, Writer out, String for
             throws IOException
     {
         TextArea.TextAreaBuilder input = new TextArea.TextAreaBuilder()
-                .columns(_inputLength)
-                .rows(_inputRows)
-                .name(getInputPrefix() + formFieldName)
-                .disabled(disabledInput)
-                .value(strVal);
+            .columns(_inputLength)
+            .rows(_inputRows)
+            .name(formFieldName)
+            .disabled(disabledInput)
+            .value(strVal);
 
         out.write(input.build().toString());
 
@@ -855,11 +851,11 @@ protected void renderTextFormInput(RenderContext ctx, Writer out, String formFie
             throws IOException
     {
         var input = new Input.InputBuilder<>()
-                .name(getInputPrefix() + formFieldName)
-                .disabled(disabledInput)
-                .size(_inputLength)
-                .value(strVal)
-                .needsWrapping(false);
+            .name(formFieldName)
+            .disabled(disabledInput)
+            .size(_inputLength)
+            .value(strVal)
+            .needsWrapping(false);
 
         out.write(input.build().toString());
 
@@ -874,22 +870,22 @@ protected void renderAutoCompleteFormInput(RenderContext ctx, Writer out, String
         String renderId = "auto-complete-div-" + UniqueID.getRequestScopedUID(ctx.getRequest());
         out.write("<div id='" + renderId + "'></div>");
         String initScript =
-                        "Ext4.onReady(function(){\n" +
-                        "        Ext4.create('LABKEY.element.AutoCompletionField', {\n" +
-                        "            renderTo        : " + PageFlowUtil.jsString(renderId) + ",\n" +
-                        "            completionUrl   : " + PageFlowUtil.jsString(autoCompleteURLPrefix) + ",\n" +
-                        "            sharedStore     : true,\n" +
-                        "            sharedStoreId   : " + PageFlowUtil.jsString(autoCompleteURLPrefix) + ",\n" +
-                        "            tagConfig   : {\n" +
-                        "                tag     : 'input',\n" +
-                        "                type    : 'text',\n" +
-                        "                name    : " + PageFlowUtil.jsString(formFieldName) + ",\n" +
-                        "                size    : " + _inputLength + ",\n" +
-                        "                value   : " + PageFlowUtil.jsString(strVal) + ",\n" +
-                        "                autocomplete : 'off'\n" +
-                        "            }\n" +
-                        "        });\n" +
-                        "      });\n"
+            "Ext4.onReady(function(){\n" +
+            "        Ext4.create('LABKEY.element.AutoCompletionField', {\n" +
+            "            renderTo        : " + PageFlowUtil.jsString(renderId) + ",\n" +
+            "            completionUrl   : " + PageFlowUtil.jsString(autoCompleteURLPrefix) + ",\n" +
+            "            sharedStore     : true,\n" +
+            "            sharedStoreId   : " + PageFlowUtil.jsString(autoCompleteURLPrefix) + ",\n" +
+            "            tagConfig   : {\n" +
+            "                tag     : 'input',\n" +
+            "                type    : 'text',\n" +
+            "                name    : " + PageFlowUtil.jsString(formFieldName) + ",\n" +
+            "                size    : " + _inputLength + ",\n" +
+            "                value   : " + PageFlowUtil.jsString(strVal) + ",\n" +
+            "                autocomplete : 'off'\n" +
+            "            }\n" +
+            "        });\n" +
+            "      });\n"
                 ;
         HttpView.currentPageConfig().addDOMContentLoadedHandler(JavaScriptFragment.unsafe(initScript));
     }
@@ -915,7 +911,7 @@ protected String h(Object value)
     @Override
     public String getSortHandler(RenderContext ctx, Sort.SortDirection sort)
     {
-        if (_displayColumn == null || _sortFieldKeys == null || _sortFieldKeys.size() == 0)
+        if (_displayColumn == null || _sortFieldKeys == null || _sortFieldKeys.isEmpty())
             return "";
 
         String regionName = ctx.getCurrentRegion().getName();
diff --git a/api/src/org/labkey/api/data/DataRegion.java b/api/src/org/labkey/api/data/DataRegion.java
index 6876faebb44..65166104d90 100644
--- a/api/src/org/labkey/api/data/DataRegion.java
+++ b/api/src/org/labkey/api/data/DataRegion.java
@@ -117,7 +117,6 @@ public class DataRegion extends DisplayElement
     private ButtonBar _insertButtonBar = new ButtonBar();
     private ButtonBar _updateButtonBar = new ButtonBar();
     private ButtonBar _detailsButtonBar = new ButtonBar();
-    private String _inputPrefix = null;
     private List<String> _recordSelectorValueColumns;
     private int _maxRows = Table.ALL_ROWS;   // Display all rows by default
     private final List<Pair<String, Object>> _hiddenFormFields = new ArrayList<>();   // Hidden params to be posted (e.g., to pass a query string along with selected grid rows)
@@ -280,8 +279,6 @@ public void addDisplayColumn(@NotNull  DisplayColumn col)
         if (null == col)
             return;
         _displayColumns.add(col);
-        if (null != _inputPrefix)
-            col.setInputPrefix(_inputPrefix);
     }
 
     public void addDisplayColumn(int index, @NotNull DisplayColumn col)
@@ -290,14 +287,6 @@ public void addDisplayColumn(int index, @NotNull DisplayColumn col)
         if (null == col)
             return;
         _displayColumns.add(index, col);
-        if (null != _inputPrefix)
-            col.setInputPrefix(_inputPrefix);
-    }
-
-    public void addDisplayColumns(List<DisplayColumn> displayColumns)
-    {
-        for (DisplayColumn displayColumn : displayColumns)
-            addDisplayColumn(displayColumn);
     }
 
     /* We don't want callers to modify this list directly.  However, this is the only way for subclasses to modify the list */
@@ -355,9 +344,6 @@ public void setDisplayColumns(List<DisplayColumn> displayColumns)
          * however, this breaks MS2 which seems to do funny things with nested RenderContexts
          */
         _displayColumns = displayColumns;
-        if (null != _inputPrefix)
-            for (DisplayColumn dc : _displayColumns)
-                dc.setInputPrefix(_inputPrefix);
     }
 
     public void removeColumns(String... columns)
@@ -417,13 +403,6 @@ public void replaceDisplayColumn(String name, DisplayColumn replacement)
         }
     }
 
-    public void setInputPrefix(String inputPrefix)
-    {
-        _inputPrefix = inputPrefix;
-        for (DisplayColumn dc : _displayColumns)
-            dc.setInputPrefix(_inputPrefix);
-    }
-
     public void addButtonBarConfig(ButtonBarConfig buttonBarConfig)
     {
         assert buttonBarConfig != null : "Cannot add a null ButtonBarConfig";
diff --git a/api/src/org/labkey/api/data/DisplayColumn.java b/api/src/org/labkey/api/data/DisplayColumn.java
index 8c654821bf0..982391a9230 100644
--- a/api/src/org/labkey/api/data/DisplayColumn.java
+++ b/api/src/org/labkey/api/data/DisplayColumn.java
@@ -82,7 +82,6 @@ public abstract class DisplayColumn extends RenderColumn
     private StringExpression _textExpression = null;
     private StringExpression _textExpressionCompiled = null;
     protected String _gridHeaderClass = "labkey-col-header-filter";
-    private String _inputPrefix = "";
     private String _description = null;
     protected boolean _requiresHtmlFiltering = true;
     private String _displayClass;
@@ -334,16 +333,6 @@ public String getName()
             return super.getName();
     }
 
-    protected String getInputPrefix()
-    {
-        return _inputPrefix;
-    }
-
-    protected void setInputPrefix(String inputPrefix)
-    {
-        _inputPrefix = inputPrefix;
-    }
-
     /** If width is null, no width will be requested in the HTML table */
     public void setWidth(@Nullable String width)
     {
@@ -596,7 +585,7 @@ public String getJsonTypeName()
         return getJsonTypeName(getValueClass());
     }
 
-    public static String getJsonTypeName(Class valueClass)
+    public static String getJsonTypeName(Class<?> valueClass)
     {
         if (String.class.isAssignableFrom(valueClass))
             return "string";
@@ -623,18 +612,16 @@ public static Class getClassFromJsonTypeName(String typeName)
         if (typeName == null)
             return String.class;
 
-        switch (typeName)
+        return switch (typeName)
         {
-            case "boolean":  return Boolean.class;
-            case "int":      return Integer.class;
-            case "float":    return Float.class;
-            case "date":     return Date.class;
-            case "string":
-            default:         return String.class;
-        }
+            case "boolean" -> Boolean.class;
+            case "int" -> Integer.class;
+            case "float" -> Float.class;
+            case "date" -> Date.class;
+            default -> String.class;
+        };
     }
 
-
     /** The value to display. Not HTML or otherwise encoded. */
     public Object getDisplayValue(RenderContext ctx)
     {
@@ -770,7 +757,7 @@ public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerCla
         {
             if (!getColumnInfo().getFieldKey().toString().equals(getColumnInfo().getLabel()))
             {
-                boolean suffix = tooltip.length() > 0;
+                boolean suffix = !tooltip.isEmpty();
                 if (suffix)
                 {
                     tooltip.append(" (");
@@ -792,18 +779,18 @@ public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerCla
                     if (null != concept)
                         conceptDisplay = concept.getLabel() + " (" + conceptDisplay + ")";
                 }
-                tooltip.append("\nConcept Annotation: " + conceptDisplay);
+                tooltip.append("\nConcept Annotation: ").append(conceptDisplay);
             }
 
             if (isPhiProtected())
             {
-                if (tooltip.length() > 0)
+                if (!tooltip.isEmpty())
                     tooltip.append("\n");
                 tooltip.append("(PHI protected data removed)");
             }
         }
 
-        if (tooltip.length() > 0)
+        if (!tooltip.isEmpty())
         {
             out.write(" title=\"");
             out.write(PageFlowUtil.filter(tooltip.toString()));
@@ -823,7 +810,7 @@ public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerCla
             style += ";width:" + getWidth() + "px;";
 
         out.write("<div ");
-        if (!"".equals(style))
+        if (!style.isEmpty())
         {
             out.write("style=\"");
             out.write(style);
@@ -844,7 +831,7 @@ public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerCla
             // 31304: click target should fill the entire cell
             out.write("<div class=\"dropdown-toggle\" data-toggle=\"dropdown\"></div>");
             out.write("<ul class=\"dropdown-menu\"");
-            if (tooltip.length() > 0) // 36050
+            if (!tooltip.isEmpty()) // 36050
                 out.write(" title=\"\"");
             out.write(">");
             PopupMenuView.renderTree(navTree, out);
@@ -894,11 +881,7 @@ private boolean isFiltered(RenderContext ctx)
                 ActionURL url = ctx.getSortFilterURLHelper();
                 SimpleFilter filter = new SimpleFilter(url, rgn.getName());
 
-                filteredColSet = new HashSet<>();
-                for (FieldKey fieldKey : filter.getWhereParamFieldKeys())
-                {
-                    filteredColSet.add(fieldKey);
-                }
+                filteredColSet = new HashSet<>(filter.getWhereParamFieldKeys());
                 ctx.put(rgn.getName() + ".filteredCols", filteredColSet);
             }
 
@@ -1115,13 +1098,13 @@ protected String getHoverTitle(RenderContext ctx)
         return null;
     }
 
-    @NotNull /** Always return a non-null string to make it easy to concatenate values */
+    @NotNull /* Always return a non-null string to make it easy to concatenate values */
     public String getDisplayClass(RenderContext ctx)
     {
         return _displayClass != null ? _displayClass : "";
     }
 
-    @NotNull /** Always return a non-null string to make it easy to concatenate values */
+    @NotNull /* Always return a non-null string to make it easy to concatenate values */
     public String getCssStyle(RenderContext ctx)
     {
         String style = "";
@@ -1265,7 +1248,7 @@ public String getFormFieldName(RenderContext ctx)
     protected void outputName(RenderContext ctx, Writer out, String formFieldName) throws IOException
     {
         out.write(" name=\"");
-        out.write(PageFlowUtil.filter(getInputPrefix() + formFieldName));
+        out.write(PageFlowUtil.filter(formFieldName));
         out.write("\"");
 
         String setFocusId = (String)ctx.get("setFocusId");
@@ -1284,7 +1267,7 @@ public void renderHiddenFormInput(RenderContext ctx, Writer out) throws IOExcept
     protected void renderHiddenFormInput(RenderContext ctx, Writer out, String formFieldName, Object value) throws IOException
     {
         out.write(new Input.InputBuilder()
-            .name(getInputPrefix() + formFieldName)
+            .name(formFieldName)
             .type("hidden")
             .value(null != value ? value.toString() : null)
             .toString());
diff --git a/api/src/org/labkey/api/data/DisplayColumnDecorator.java b/api/src/org/labkey/api/data/DisplayColumnDecorator.java
index 199e54508e0..38b07dabe20 100644
--- a/api/src/org/labkey/api/data/DisplayColumnDecorator.java
+++ b/api/src/org/labkey/api/data/DisplayColumnDecorator.java
@@ -226,18 +226,6 @@ public String getName()
         return _column.getName();
     }
 
-    @Override
-    protected String getInputPrefix()
-    {
-        return _column.getInputPrefix();
-    }
-
-    @Override
-    protected void setInputPrefix(String inputPrefix)
-    {
-        _column.setInputPrefix(inputPrefix);
-    }
-
     @Override
     public void setWidth(@Nullable String width)
     {
diff --git a/api/src/org/labkey/api/data/JdbcType.java b/api/src/org/labkey/api/data/JdbcType.java
index da473636322..d9cd923b831 100644
--- a/api/src/org/labkey/api/data/JdbcType.java
+++ b/api/src/org/labkey/api/data/JdbcType.java
@@ -301,25 +301,25 @@ protected Collection<Integer> getSqlTypes()
 
 
     public final int sqlType;
-    public final Class cls;
+    public final Class<?> cls;
     public final String xtype;
     public final String json;
 
-    private final Class typeCls;
+    private final Class<?> typeCls;
     private final Converter converter;
 
 
-    JdbcType(int type, @NotNull Class cls)
+    JdbcType(int type, @NotNull Class<?> cls)
     {
         this(type, cls, null);
     }
 
-    JdbcType(int type, @NotNull Class cls, @Nullable Class typeCls)
+    JdbcType(int type, @NotNull Class<?> cls, @Nullable Class<?> typeCls)
     {
         this(type, cls, typeCls, "textfield");
     }
 
-    JdbcType(int type, @NotNull Class cls, @Nullable Class typeCls, String xtype)
+    JdbcType(int type, @NotNull Class<?> cls, @Nullable Class<?> typeCls, String xtype)
     {
         // make sure ConvertHelper is initialized
         ConvertHelper.getPropertyEditorRegistrar();
@@ -332,7 +332,7 @@ protected Collection<Integer> getSqlTypes()
         this.converter = ConvertUtils.lookup(cls);
     }
 
-    private static final HashMap<Class, JdbcType> classMap = new HashMap<>();
+    private static final HashMap<Class<?>, JdbcType> classMap = new HashMap<>();
     private static final HashMap<Integer, JdbcType> sqlTypeMap = new HashMap<>();
 
     static
@@ -398,7 +398,7 @@ public static JdbcType valueOf(int type)
         return null != jt ? jt : OTHER;
     }
 
-    public static JdbcType valueOf(Class cls)
+    public static JdbcType valueOf(Class<?> cls)
     {
         JdbcType t = classMap.get(cls);
         if (null != t)
diff --git a/api/src/org/labkey/api/view/DetailsView.java b/api/src/org/labkey/api/view/DetailsView.java
index 4ab21a68b75..ab4d99efe6f 100644
--- a/api/src/org/labkey/api/view/DetailsView.java
+++ b/api/src/org/labkey/api/view/DetailsView.java
@@ -36,7 +36,7 @@
  */
 public class DetailsView extends DataView
 {
-    private Object[] _pk;
+    private final Object[] _pk;
 
     public DetailsView(DataRegion dataRegion, TableViewForm form)
     {
@@ -82,8 +82,7 @@ protected void _renderDataRegion(RenderContext ctx, Writer out) throws IOExcepti
     @Override
     public LinkedHashSet<ClientDependency> getClientDependencies()
     {
-        LinkedHashSet<ClientDependency> resources = new LinkedHashSet<>();
-        resources.addAll(super.getClientDependencies());
+        LinkedHashSet<ClientDependency> resources = new LinkedHashSet<>(super.getClientDependencies());
 
         DataRegion dataRegion = getDataRegion();
         if (dataRegion != null)
diff --git a/api/src/org/labkey/api/view/TypeAheadSelectDisplayColumn.java b/api/src/org/labkey/api/view/TypeAheadSelectDisplayColumn.java
index 20a3c650244..c184db54c73 100644
--- a/api/src/org/labkey/api/view/TypeAheadSelectDisplayColumn.java
+++ b/api/src/org/labkey/api/view/TypeAheadSelectDisplayColumn.java
@@ -66,7 +66,7 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws
         //sb.append("LABKEY.requiresScript('http://localhost:3001/querySelectInput.js', function() {\n");
         sb.append("LABKEY.requiresScript('gen/querySelectInput', function() {\n");
         sb.append(" LABKEY.App.loadApp('querySelectInput', ").append(PageFlowUtil.jsString(renderId)).append(", {\n");
-        sb.append("     name: ").append(PageFlowUtil.jsString(getInputPrefix() + formFieldName)).append("\n");
+        sb.append("     name: ").append(PageFlowUtil.jsString(formFieldName)).append("\n");
         sb.append("     ,value: ").append(PageFlowUtil.jsString(strVal)).append("\n");
         sb.append("     ,disabled: ").append(disabledInput).append("\n");
         sb.append("     ,schemaName: ").append(PageFlowUtil.jsString(fk.getLookupSchemaName())).append("\n");
diff --git a/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java b/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
index c717835a1f0..380bc52d634 100644
--- a/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
+++ b/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
@@ -27,10 +27,6 @@
 import java.io.Writer;
 import java.util.List;
 
-/**
- * User: jeckels
- * Date: Apr 24, 2006
- */
 public class AssignedToDisplayColumn extends DataColumn
 {
     private final Container _container;
@@ -48,7 +44,7 @@ public void renderInputHtml(RenderContext ctx, Writer out, Object value) throws
         List<User> list = MothershipManager.get().getAssignedToList(_container);
 
         out.write("<select name=\"");
-        out.write(PageFlowUtil.filter(getInputPrefix() + getColumnInfo().getPropertyName()));
+        out.write(PageFlowUtil.filter(getColumnInfo().getPropertyName()));
         out.write("\">\n");
         out.write("<option value=\"\"></option>\n");