diff --git a/lib/render/mayaToHydra/shadingModeExporter.cpp b/lib/render/mayaToHydra/shadingModeExporter.cpp
index 5fd4ce0b3..1088e7447 100644
--- a/lib/render/mayaToHydra/shadingModeExporter.cpp
+++ b/lib/render/mayaToHydra/shadingModeExporter.cpp
@@ -181,7 +181,7 @@ public:
                 }
 
                 // If there is no universal surface output, hook that up too
-                if (surfaceOutput = material.GetSurfaceOutput()) {
+                if ( (surfaceOutput = material.GetSurfaceOutput()) ) {
                     UsdShadeConnectableAPI::ConnectToSource(
                         surfaceOutput, outputProperty);
                 }
diff --git a/lib/usd/hdMaya/adapters/materialAdapter.cpp b/lib/usd/hdMaya/adapters/materialAdapter.cpp
index ae8f28e63..781536740 100644
--- a/lib/usd/hdMaya/adapters/materialAdapter.cpp
+++ b/lib/usd/hdMaya/adapters/materialAdapter.cpp
@@ -80,28 +80,6 @@ struct _ShaderSourceAndMeta {
     VtDictionary translucentMetadata;
 #endif
 };
-// We can't store the shader here explicitly, since it causes a deadlock
-// due to library dependencies.
-auto _PreviewShader = []() -> const _ShaderSourceAndMeta& {
-    static const auto ret = []() -> _ShaderSourceAndMeta {
-        auto& registry = SdrRegistry::GetInstance();
-        auto sdrNode = registry.GetShaderNodeByIdentifierAndType(
-            UsdImagingTokens->UsdPreviewSurface, HioGlslfxTokens->glslfx);
-        if (!sdrNode) { return {"", ""}; }
-        HioGlslfx gfx(sdrNode->GetSourceURI());
-        _ShaderSourceAndMeta ret;
-        ret.surfaceCode = gfx.GetSurfaceSource();
-        ret.displacementCode = gfx.GetDisplacementSource();
-        ret.metadata = gfx.GetMetadata();
-#ifdef HDMAYA_OIT_ENABLED
-        ret.translucentMetadata = gfx.GetMetadata();
-        ret.translucentMetadata[HdShaderTokens->materialTag] =
-            VtValue(HdxMaterialTagTokens->translucent);
-#endif
-        return ret;
-    }();
-    return ret;
-};
 
 #if USD_VERSION_NUM < 1901
 enum class HdTextureType { Uv, Ptex, Udim };
diff --git a/lib/usd/hdMaya/adapters/proxyAdapter.cpp b/lib/usd/hdMaya/adapters/proxyAdapter.cpp
index 6e856e153..41da11542 100644
--- a/lib/usd/hdMaya/adapters/proxyAdapter.cpp
+++ b/lib/usd/hdMaya/adapters/proxyAdapter.cpp
@@ -49,11 +49,6 @@
 
 namespace {
 
-#if WANT_UFE_BUILD
-constexpr auto USD_UFE_RUNTIME_NAME = "USD";
-// static UFE_NS::Rtid usdUfeRtid = 0;
-#endif // WANT_UFE_BUILD
-
 #ifdef HD_MAYA_AL_OVERRIDE_PROXY_SELECTION
 
 constexpr auto HD_STORM_OVERRIDE_NAME =