diff --git a/flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java b/flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java
index 247234809d..36f1a74fc4 100644
--- a/flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java
+++ b/flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java
@@ -24,7 +24,7 @@
 import org.fhcrc.cpas.flow.script.xml.ScriptDocument;
 import org.json.JSONArray;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.flow.analysis.model.Analysis;
 import org.labkey.flow.analysis.model.AutoCompensationScript;
 import org.labkey.flow.analysis.model.Population;
diff --git a/flow/src/org/labkey/flow/controllers/editscript/ScriptController.java b/flow/src/org/labkey/flow/controllers/editscript/ScriptController.java
index 72bff8070a..2c36c511bc 100644
--- a/flow/src/org/labkey/flow/controllers/editscript/ScriptController.java
+++ b/flow/src/org/labkey/flow/controllers/editscript/ScriptController.java
@@ -448,12 +448,12 @@ public PopulationName[] getGroupAnalysisNames()
             List<PopulationName> ret = new ArrayList<>();
             for (Analysis analysis : form._workspaceObject.getGroupAnalyses().values())
             {
-                if (analysis.getPopulations().size() > 0)
+                if (!analysis.getPopulations().isEmpty())
                 {
                     ret.add(analysis.getName());
                 }
             }
-            return ret.toArray(new PopulationName[ret.size()]);
+            return ret.toArray(new PopulationName[0]);
         }
 
         public Map<String, String> getSampleAnalysisNames()
@@ -466,7 +466,7 @@ public Map<String, String> getSampleAnalysisNames()
             for (Workspace.SampleInfo sample : form._workspaceObject.getSamplesComplete())
             {
                 Analysis analysis = form._workspaceObject.getSampleAnalysis(sample);
-                if (analysis.getPopulations().size() > 0)
+                if (!analysis.getPopulations().isEmpty())
                 {
                     ret.put(sample.getSampleId(), sample.getLabel());
                 }
diff --git a/flow/src/org/labkey/flow/controllers/editscript/uploadAnalysis.jsp b/flow/src/org/labkey/flow/controllers/editscript/uploadAnalysis.jsp
index 2f7d738176..54c9f1b986 100644
--- a/flow/src/org/labkey/flow/controllers/editscript/uploadAnalysis.jsp
+++ b/flow/src/org/labkey/flow/controllers/editscript/uploadAnalysis.jsp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.element.Input.InputBuilder" %>
+<%@ page import="org.labkey.api.util.InputBuilder" %>
 <%@ page import="org.labkey.flow.analysis.model.PopulationName" %>
 <%@ page import="org.labkey.flow.analysis.model.StatisticSet" %>
 <%@ page import="org.labkey.flow.controllers.editscript.ScriptController.UploadAnalysisAction" %>
diff --git a/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java b/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
index 80a4d4baad..4d8353824a 100644
--- a/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
+++ b/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
@@ -46,7 +46,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.SimpleNamedObject;
 import org.labkey.api.util.StringExpression;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.GridView;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.flow.analysis.model.ISampleInfo;
@@ -335,8 +335,7 @@ protected void renderExtraRecordSelectorContent(RenderContext ctx, HtmlWriter ou
         {
             // Add a hidden input for spring form binding -- if this value is posted, the row was unchecked.
             out.write(
-                new InputBuilder<>()
-                    .type("hidden")
+                InputBuilder.hidden()
                     .name(SpringActionController.FIELD_MARKER + getRecordSelectorName(ctx))
                     .value(0)
             );
@@ -515,7 +514,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 String sampleId = ctx.get(SAMPLE_ID_FIELD_KEY, String.class);
                 for (FlowFCSFile candidate : candidates)
                 {
-                    out.write(new InputBuilder<>().type("hidden").name("selectedSamples.rows[" + sampleId + "].candidateFile").value(candidate.getRowId()));
+                    out.write(InputBuilder.hidden().name("selectedSamples.rows[" + sampleId + "].candidateFile").value(candidate.getRowId()));
                     out.write("\n");
                 }
             }
diff --git a/flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp b/flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp
index 42556ca5f0..22e1b2c74e 100644
--- a/flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp
+++ b/flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.element.Option" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.flow.analysis.web.GraphSpec" %>
@@ -141,7 +141,7 @@
             <td>
                 <%=select().name(FlowParam.actionSequence.name())
                         .className(null)
-                        .addOptions(steps.stream().map(s->new Option.OptionBuilder(s.getLabel(), s.getDefaultActionSequence()).selected(s == finalStep)))
+                        .addOptions(steps.stream().map(s->new OptionBuilder(s.getLabel(), s.getDefaultActionSequence()).selected(s == finalStep)))
                         .onChange("this.form.submit();")
                 %>
             </td>
diff --git a/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java b/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java
index 7fc218bd8e..0430d0f998 100644
--- a/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java
+++ b/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java
@@ -54,7 +54,7 @@
 import org.labkey.api.study.assay.ParticipantVisitResolverType;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.InsertView;
 import org.labkey.api.view.JspView;
@@ -438,7 +438,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
                     TD(
                         at(style, "display:" + (hideCell ? "none" : "table-cell")).
                         name(titrationCellName),
-                        new Input.InputBuilder<>().type("checkbox").name(id).id(id)
+                        InputBuilder.checkbox().name(id).id(id)
                     ).appendTo(out);
 
                     StringBuilder onchange = new StringBuilder("b = this.checked;");
diff --git a/luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java b/luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java
index 2a40c978a9..a83240a874 100644
--- a/luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java
+++ b/luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java
@@ -23,15 +23,13 @@
 import org.labkey.api.data.SqlSelector;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.luminex.LuminexRunUploadForm;
 import org.labkey.luminex.LuminexUploadWizardAction;
 import org.labkey.luminex.model.Analyte;
 import org.labkey.luminex.model.Titration;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.Map;
 import java.util.Set;
 
@@ -117,7 +115,7 @@ else if (defVal == null || defVal.equalsIgnoreCase("true"))
             }
         }
 
-        out.write(new InputBuilder<>().type("checkbox").value(1).name(propertyName).checked(checked));
+        out.write(InputBuilder.checkbox().value(1).name(propertyName).checked(checked));
     }
 
     @Override
diff --git a/luminex/src/org/labkey/luminex/query/ExclusionUIDisplayColumn.java b/luminex/src/org/labkey/luminex/query/ExclusionUIDisplayColumn.java
index cc07e919ab..75a0068bf9 100644
--- a/luminex/src/org/labkey/luminex/query/ExclusionUIDisplayColumn.java
+++ b/luminex/src/org/labkey/luminex/query/ExclusionUIDisplayColumn.java
@@ -26,7 +26,7 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.DOM.Attribute;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
diff --git a/luminex/src/org/labkey/luminex/query/LuminexProtocolSchema.java b/luminex/src/org/labkey/luminex/query/LuminexProtocolSchema.java
index 2a9891c740..5944c4d73e 100644
--- a/luminex/src/org/labkey/luminex/query/LuminexProtocolSchema.java
+++ b/luminex/src/org/labkey/luminex/query/LuminexProtocolSchema.java
@@ -62,7 +62,7 @@
 import org.labkey.api.study.Dataset;
 import org.labkey.api.study.publish.StudyPublishService;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
diff --git a/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnFactory.java b/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnFactory.java
index 6b97101a8e..e668bd3061 100644
--- a/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnFactory.java
+++ b/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnFactory.java
@@ -28,7 +28,7 @@
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JavaScriptFragment;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.luminex.LuminexDataHandler;
 
diff --git a/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java b/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java
index 0055351476..bb25cdd40f 100644
--- a/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java
+++ b/luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java
@@ -20,7 +20,7 @@
 import org.labkey.api.data.DisplayColumnGroup;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.util.DOM;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.luminex.LuminexDataHandler;
@@ -46,7 +46,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
             isCopyable() ? (DOM.Renderable) ret -> {
                 String inputName = ColumnInfo.propNameFromName(_inputName);
                 String id = inputName + "CheckBox";
-                new Input.InputBuilder<>().type("checkbox").name(id).id(id).appendTo(out);
+                InputBuilder.checkbox().name(id).id(id).appendTo(out);
                 StringBuilder onChange = new StringBuilder("b = this.checked;\n");
 
                 getColumns().forEach(col -> {
diff --git a/luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp b/luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp
index 314674a594..40394875d8 100644
--- a/luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp
+++ b/luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp
@@ -17,7 +17,7 @@
 %>
 <%@ page import="org.labkey.api.data.DataRegion" %>
 <%@ page import="org.labkey.api.data.DataRegionSelection" %>
-<%@ page import="org.labkey.api.util.Link" %>
+<%@ page import="org.labkey.api.util.LinkBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -61,7 +61,7 @@
         <% for (GuideSet gs : guideSets) { %>
             <li>
             <%
-                new Link.LinkBuilder("Guide Set " + gs.getGuideSetId() + ": " + gs.getComment())
+                new LinkBuilder("Guide Set " + gs.getGuideSetId() + ": " + gs.getComment())
                     .href("#")
                     .attributes(Map.of(tabindex.name(), "-1"))
                     .onClick("createGuideSetWindow(" + bean.getProtocol().getRowId() + ", " + gs.getGuideSetId() + ", false)")
diff --git a/ms2/src/org/labkey/ms2/MS2Controller.java b/ms2/src/org/labkey/ms2/MS2Controller.java
index 9355e0a865..7eed9c2fb9 100644
--- a/ms2/src/org/labkey/ms2/MS2Controller.java
+++ b/ms2/src/org/labkey/ms2/MS2Controller.java
@@ -126,17 +126,17 @@
 import org.labkey.api.util.Formats;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.NetworkDrive;
+import org.labkey.api.util.OptionBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.ReturnURLString;
 import org.labkey.api.util.SafeToRenderEnum;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.TestContext;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
 import org.labkey.api.view.GridView;
diff --git a/ms2/src/org/labkey/ms2/ShowPeptideContext.java b/ms2/src/org/labkey/ms2/ShowPeptideContext.java
index f5f689f247..167d13b8a4 100644
--- a/ms2/src/org/labkey/ms2/ShowPeptideContext.java
+++ b/ms2/src/org/labkey/ms2/ShowPeptideContext.java
@@ -18,7 +18,7 @@
 
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 
 public class ShowPeptideContext
diff --git a/ms2/src/org/labkey/ms2/ms2Admin.jsp b/ms2/src/org/labkey/ms2/ms2Admin.jsp
index 956ff65671..8b4d0a02bf 100644
--- a/ms2/src/org/labkey/ms2/ms2Admin.jsp
+++ b/ms2/src/org/labkey/ms2/ms2Admin.jsp
@@ -36,19 +36,19 @@
 </tr>
 <tr class="labkey-alternate-row">
     <td style="font-weight: bold;">Successful</td>
-    <td align="right"><%=link(bean.stats.get("successfulRuns"), bean.successfulURL).clearClasses()%></td>
+    <td align="right"><%=simpleLink(bean.stats.get("successfulRuns"), bean.successfulURL)%></td>
     <td align="right"><%=h(bean.stats.get("successfulPeptides"))%></td>
     <td align="right"><%=h(bean.stats.get("successfulSpectra"))%></td>
 </tr>
 <tr class="labkey-row">
     <td style="font-weight: bold;">In-Process</td>
-    <td align="right"><%=link(bean.stats.get("inProcessRuns"), bean.inProcessURL).clearClasses()%></td>
+    <td align="right"><%=simpleLink(bean.stats.get("inProcessRuns"), bean.inProcessURL)%></td>
     <td align="right"><%=h(bean.stats.get("inProcessPeptides"))%></td>
     <td align="right"><%=h(bean.stats.get("inProcessSpectra"))%></td>
 </tr>
 <tr class="labkey-alternate-row">
     <td style="font-weight: bold;">Failed</td>
-    <td align="right"><%=link(bean.stats.get("failedRuns"), bean.failedURL).clearClasses()%></td>
+    <td align="right"><%=simpleLink(bean.stats.get("failedRuns"), bean.failedURL)%></td>
     <td align="right"><%=h(bean.stats.get("failedPeptides"))%></td>
     <td align="right"><%=h(bean.stats.get("failedSpectra"))%></td>
 </tr>
@@ -57,7 +57,7 @@
 </tr>
     <tr class="labkey-alternate-row">
     <td style="font-weight: bold;">Deleted</td>
-    <td align="right"><%=link(bean.stats.get("deletedRuns"), bean.deletedURL).clearClasses()%></td>
+    <td align="right"><%=simpleLink(bean.stats.get("deletedRuns"), bean.deletedURL)%></td>
     <td align="right"><%=h(bean.stats.get("deletedPeptides"))%></td>
     <td align="right"><%=h(bean.stats.get("deletedSpectra"))%></td>
 </tr>
diff --git a/ms2/src/org/labkey/ms2/query/FilterView.java b/ms2/src/org/labkey/ms2/query/FilterView.java
index 0b8a0fc870..6be9aabe5d 100644
--- a/ms2/src/org/labkey/ms2/query/FilterView.java
+++ b/ms2/src/org/labkey/ms2/query/FilterView.java
@@ -20,7 +20,7 @@
 import org.labkey.api.query.QueryParam;
 import org.labkey.api.query.QuerySettings;
 import org.labkey.api.query.QueryView;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ViewContext;
 import org.labkey.ms2.MS2Controller;
 
diff --git a/protein/api-src/org/labkey/api/protein/ProteinManager.java b/protein/api-src/org/labkey/api/protein/ProteinManager.java
index 34cbdab2bc..efba9b31a7 100644
--- a/protein/api-src/org/labkey/api/protein/ProteinManager.java
+++ b/protein/api-src/org/labkey/api/protein/ProteinManager.java
@@ -19,7 +19,7 @@
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HashHelpers;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.NotFoundException;
 
 import java.io.ByteArrayOutputStream;
@@ -298,7 +298,7 @@ public static HtmlString makeFullAnchorLink(String url, String target, String tx
         if (null == url)
             return HtmlString.of(txt);
 
-        return new Link.LinkBuilder(txt).href(url).target(target).clearClasses().getHtmlString();
+        return new LinkBuilder(txt).href(url).target(target).clearClasses().getHtmlString();
     }
 
     public static List<HtmlString> makeFullAnchorLinks(Collection<String> idents, String target, String identType)