diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs
index e6e68bd..3302541 100644
--- a/agora/Agora/Proposal.hs
+++ b/agora/Agora/Proposal.hs
@@ -84,7 +84,6 @@ import Plutarch.Lift (
   PUnsafeLiftDecl (..),
  )
 import Plutarch.SafeMoney (PDiscrete (..))
-import Plutarch.Show (PShow (..))
 import PlutusLedgerApi.V2 (Credential, DatumHash, ScriptHash, ValidatorHash)
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as AssocMap
diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs
index 4611b41..9b0413e 100644
--- a/agora/Agora/Stake.hs
+++ b/agora/Agora/Stake.hs
@@ -51,7 +51,6 @@ import Plutarch.Extra.Sum (PSum (..))
 import Plutarch.Extra.Traversable (pfoldMap)
 import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (..))
 import Plutarch.SafeMoney (PDiscrete)
-import Plutarch.Show (PShow (..))
 import PlutusLedgerApi.V1 (Credential)
 import PlutusTx qualified
 import Prelude hiding (Num (..))
@@ -328,6 +327,8 @@ data PProposalLock (s :: S)
       PIsData
     , -- | @since 0.1.0
       PEq
+    , -- | @since 0.2.0
+      PShow
     )
 
 instance DerivePlutusType PProposalLock where
@@ -349,15 +350,6 @@ deriving via
   instance
     (Plutarch.Lift.PConstantDecl ProposalLock)
 
--- | @since 0.2.0
-instance PShow PProposalLock where
-  pshow' :: Bool -> Term s PProposalLock -> Term s PString
-  pshow' True x = "(" <> pshow' False x <> ")"
-  pshow' False lock = pmatch lock $ \case
-    PCreated ((pfield @"created" #) -> pid) -> "PCreated " <> pshow' True pid
-    PVoted x -> pletFields @'["votedOn", "votedFor"] x $ \xF ->
-      "PVoted " <> pshow' True xF.votedOn <> " " <> pshow' True xF.votedFor
-
 --------------------------------------------------------------------------------
 
 {- | Check whether a Stake is locked. If it is locked, various actions are unavailable.
diff --git a/agora/Agora/Treasury.hs b/agora/Agora/Treasury.hs
index b411efe..27a2c7a 100644
--- a/agora/Agora/Treasury.hs
+++ b/agora/Agora/Treasury.hs
@@ -8,7 +8,11 @@ Description: Treasury scripts.
 Contains the datum, redeemer and validator for a template DAO
 treasury.
 -}
-module Agora.Treasury (module Agora.Treasury) where
+module Agora.Treasury (
+  TreasuryRedeemer (..),
+  PTreasuryRedeemer (..),
+  treasuryValidator,
+) where
 
 import Agora.AuthorityToken (singleAuthorityTokenBurned)
 import Generics.SOP qualified as SOP