2 files changed, 6 insertions, 7 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 52635be..58a2d01 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -158,7 +158,7 @@ data InputFile = HomeSec
                | FileDesc Posix.Fd
  deriving (Eq,Ord)
 
-type UsageTag = String
+-- type UsageTag = String
 type Initializer = String
 type PassWordFile = InputFile
 
@@ -167,7 +167,7 @@ type PassWordFile = InputFile
 -- the KF_Match fill/spill KeyFilter styles.  The parameter
 -- to KeyRingFile will be subsumbed by kPassphrases
 data FileType = KeyRingFile (Maybe PassWordFile)
-              | PEMFile UsageTag
+              | PEMFile
               | WalletFile -- (Maybe UsageTag)
               | Hosts
 
@@ -242,7 +242,6 @@ noManip _ _ = []
 
 data KeyRingOperation = KeyRingOperation
     { kFiles :: Map.Map InputFile StreamInfo
-    , kImports :: Map.Map InputFile (KeyRingRuntime -> KeyData -> Maybe Bool)
     , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate]
     , homeSpec :: Maybe String
     }
diff --git a/kiki.hs b/kiki.hs
index d695afc..ff21529 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -816,11 +816,13 @@ sync bExport bImport bSecret cmdarg args_raw = do
                     in if bExport
                         then (ArgFile path, StreamInfo { fill = KF_Match usage
                                                        , spill = KF_Match usage
-                                                       , typ = PEMFile usage
+                                                       , typ = PEMFile
                                                        , access = Sec
                                                        , initializer = cmd' })
                         else if isNothing cmd'
-                                then (ArgFile path, buildStreamInfo KF_None (PEMFile usage))
+                                then ( ArgFile path
+                                     , (buildStreamInfo KF_None PEMFile)
+                                        { spill = KF_Match usage })
                                 else error "Unexpected PEM file initializer."
         walts = map (\fname -> ( ArgFile fname
                                , (buildStreamInfo reftyp WalletFile) { access = Sec }))
@@ -863,7 +865,6 @@ sync bExport bImport bSecret cmdarg args_raw = do
                 ++ if bSecret then pems else []
                 ++ if bSecret then walts else []
                 ++ hosts
-            , kImports = Map.fromList [ ( HomePub, importStyle ) ]
             , kManip = maybe noManip (const doAutosign) $ Map.lookup "--autosign" margs
             , homeSpec = homespec
             }
@@ -966,7 +967,6 @@ kiki "show" args = do
                 ++ pems 
                 ++ walts 
                 ++ hosts
-            , kImports = Map.empty 
             , kManip = noManip 
             , homeSpec = homespec
             }