diff --git a/agora-scripts/Main.hs b/agora-scripts/Main.hs
index c56740b..e1aa7f5 100644
--- a/agora-scripts/Main.hs
+++ b/agora-scripts/Main.hs
@@ -9,10 +9,13 @@
 module Main (main) where
 
 import Agora.Bootstrap qualified as Bootstrap
-import Agora.Linker
+import Agora.Linker (linker)
 import Data.Default (def)
-import ScriptExport.Export
-import ScriptExport.Types
+import ScriptExport.Export (exportMain)
+import ScriptExport.Types (
+  Builders,
+  insertScriptExportWithLinker,
+ )
 
 main :: IO ()
 main = exportMain builders
diff --git a/agora/Agora/Effect/GovernorMutation.hs b/agora/Agora/Effect/GovernorMutation.hs
index 7137186..422b5ee 100644
--- a/agora/Agora/Effect/GovernorMutation.hs
+++ b/agora/Agora/Effect/GovernorMutation.hs
@@ -25,7 +25,6 @@ import Agora.Governor (
   PGovernorDatum,
   PGovernorRedeemer,
  )
-import Agora.Plutarch.Orphans ()
 import Agora.SafeMoney (AuthorityTokenTag, GovernorSTTag)
 import Agora.Utils (psymbolValueOfT)
 import Plutarch.Api.V1 (PCurrencySymbol, PValidatorHash)
diff --git a/agora/Agora/Effect/NoOp.hs b/agora/Agora/Effect/NoOp.hs
index adafe86..39f50c2 100644
--- a/agora/Agora/Effect/NoOp.hs
+++ b/agora/Agora/Effect/NoOp.hs
@@ -8,12 +8,10 @@ A dumb effect that only burns its GAT.
 module Agora.Effect.NoOp (noOpValidator, PNoOp) where
 
 import Agora.Effect (makeEffect)
-import Agora.Plutarch.Orphans ()
 import Agora.SafeMoney (AuthorityTokenTag)
 import Plutarch.Api.V1 (PCurrencySymbol)
 import Plutarch.Api.V2 (PValidator)
 import Plutarch.Extra.Tagged (PTagged)
-import Plutarch.Orphans ()
 
 {- | Dummy datum for NoOp effect.
 
diff --git a/agora/Agora/Effect/TreasuryWithdrawal.hs b/agora/Agora/Effect/TreasuryWithdrawal.hs
index 203fd96..4f3c1fd 100644
--- a/agora/Agora/Effect/TreasuryWithdrawal.hs
+++ b/agora/Agora/Effect/TreasuryWithdrawal.hs
@@ -14,7 +14,6 @@ module Agora.Effect.TreasuryWithdrawal (
 ) where
 
 import Agora.Effect (makeEffect)
-import Agora.Plutarch.Orphans ()
 import Agora.SafeMoney (AuthorityTokenTag)
 import Plutarch.Api.V1 (
   PCredential,
diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs
index 714c440..19c232a 100644
--- a/agora/Agora/Stake.hs
+++ b/agora/Agora/Stake.hs
@@ -81,7 +81,6 @@ import Plutarch.Extra.Tagged (PTagged)
 import Plutarch.Extra.Traversable (pfoldMap)
 import Plutarch.Extra.Value (passetClassValueOfT)
 import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted))
-import Plutarch.Orphans ()
 import PlutusLedgerApi.V2 (Credential)
 import PlutusTx qualified