diff --git a/pisi.e3p b/pisi.e3p
index f063fae5..c9556044 100644
--- a/pisi.e3p
+++ b/pisi.e3p
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-3.8.dtd">
 <!-- Project file for project pisi -->
-<!-- Saved: 2005-09-02, 17:09:47 -->
-<!-- Copyright (C) 2005 PiSi Development Team, pisi@uludag.org.tr -->
+<!-- Saved: 2005-09-20, 16:43:07 -->
+<!-- Copyright (C) 2005 PiSi Development Team,  -->
 <Project version="3.8">
   <ProgLanguage mixed="0">Python</ProgLanguage>
   <UIType>Qt</UIType>
   <Description>The package management software of Pardus distribution.
 </Description>
-  <VersIon>0.2</VersIon>
   <Author>PiSi Development Team</Author>
-  <EmaIl>pisi@uludag.org.tr</EmaIl>
+  <EmaIl></EmaIl>
   <Sources>
     <Source>
       <Dir>tools</Dir>
@@ -311,6 +310,9 @@
       <Dir>pisi</Dir>
       <Name>specfilenew.py</Name>
     </Source>
+    <Source>
+      <Name>TODO</Name>
+    </Source>
   </Sources>
   <Forms>
   </Forms>
@@ -349,9 +351,9 @@
   </Vcs>
   <FiletypeAssociations>
     <FiletypeAssociation pattern="*.ui.h" type="FORMS" />
-    <FiletypeAssociation pattern="*.ui" type="FORMS" />
-    <FiletypeAssociation pattern="*.idl" type="INTERFACES" />
-    <FiletypeAssociation pattern="*.py" type="SOURCES" />
     <FiletypeAssociation pattern="*.ptl" type="SOURCES" />
+    <FiletypeAssociation pattern="*.idl" type="INTERFACES" />
+    <FiletypeAssociation pattern="*.ui" type="FORMS" />
+    <FiletypeAssociation pattern="*.py" type="SOURCES" />
   </FiletypeAssociations>
 </Project>
diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index 6645543a..6b6bb55d 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -261,11 +261,11 @@ class PackageOp(Command):
     def init(self):
         super(PackageOp, self).init(True)
         import pisi
-        import pisi.comariface
         if not self.options.ignore_comar:
             try:
-                pisi.comariface.init()
-            except pisi.comariface.ComarError:
+                import comar
+                ctx.comard = comar.Link() # context
+            except comar.Error:
                 ctx.ui.error('Comar error encountered\n')
                 self.die()
                 
diff --git a/pisi/context.py b/pisi/context.py
index 3ec733f4..0a2f1b9f 100644
--- a/pisi/context.py
+++ b/pisi/context.py
@@ -29,6 +29,8 @@ ui = None # not now
 installdb = None
 repodb = None
 
+comar = None
+
 #def register(_impl):
 #    """ Register a UI implementation"""
 #    ui = _impl
diff --git a/pisi/install.py b/pisi/install.py
index 446fba98..4e4d6301 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -25,7 +25,6 @@ import pisi.operations as operations
 from pisi.specfile import *
 from pisi.package import Package
 from pisi.metadata import MetaData
-from pisi.comariface import comard
 #import conflicts
 
 class InstallError(pisi.Error):
diff --git a/pisi/operations.py b/pisi/operations.py
index ca63ad0b..c5864d91 100644
--- a/pisi/operations.py
+++ b/pisi/operations.py
@@ -23,7 +23,6 @@ from pisi.uri import URI
 
 def remove_single(package_name):
     """Remove a single package"""
-    from comariface import comard
     inst_packagedb = packagedb.inst_packagedb
 
     #TODO: check dependencies
@@ -32,6 +31,9 @@ def remove_single(package_name):
     if not ctx.installdb.is_installed(package_name):
         raise Exception('Trying to remove nonexistent package '
                         + package_name)
+    if ctx.comard:
+        ctx.comard.remove(package_name)
+        ctx.comard.call("System.Package", "preremove")
     for fileinfo in ctx.installdb.files(package_name).list:
         fpath = os.path.join(ctx.config.destdir, fileinfo.path)
         # TODO: We have to store configuration files for futher
@@ -44,9 +46,6 @@ def remove_single(package_name):
             os.unlink(fpath)
     ctx.installdb.remove(package_name)
     packagedb.remove_package(package_name)
-    if comard:
-        # FIXME: (return value)...
-        comard.remove(package_name)
 
 def install_single(pkg, upgrade = False):
     """install a single package from URI or ID"""
diff --git a/tests/a.xml b/tests/a.xml
index 375d2644..4245a7d5 100644
--- a/tests/a.xml
+++ b/tests/a.xml
@@ -2,8 +2,11 @@
 <A href="http://www.cs.bilkent.edu.tr/~erayo">
   <Name>Eray Ozkural</Name>
   <Number>868</Number>
+  <Description>Lazy Tin</Description>
+  <Description xml:lang="tr">Tembel Teneke</Description>
   <Projects>
       <Project>pisi</Project>
       <Project>noatun</Project>
+      <Project>kdevelop</Project>
  </Projects>
 </A>