diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index bb9d87f6..e7490d67 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -167,11 +167,11 @@ class Index(Command):
             self.help()
             return
 
-        from pisi.cli import indexhelper
+        from pisi.operations import index
         if len(self.args)==1:
-            indexhelper.index(self.args[0])
+            index(self.args[0])
         elif len(self.args)==0:
-            indexhelper.index()
+            index()
         else:
             print 'Indexing only a single directory supported'
             return
@@ -186,8 +186,8 @@ class UpdateDB(Command):
             self.help()
             return
 
-        from pisi.cli import indexhelper
+        from pisi.operations import updatedb
         indexfile = self.args[0]
-        indexhelper.updatedb(indexfile)
+        updatedb(indexfile)
 
 
diff --git a/pisi/cli/indexhelper.py b/pisi/cli/indexhelper.py
deleted file mode 100644
index 14dd545e..00000000
--- a/pisi/cli/indexhelper.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pisi.index import Index
-from pisi.ui import ui
-
-def index(repo_dir = '.'):
-    ui.info('* Building index of PISI files under ' + repo_dir + '\n')
-
-    index = Index()
-    index.index(repo_dir)
-    index.write('pisi-index.xml')
-    
-    ui.info('* Index file written\n')
-
-def updatedb(indexfile):
-    ui.info('* Updating DB from index file: ' + indexfile + '\n')
-
-    index = Index()
-    index.read(indexfile)
-    index.update_db()
-
-    ui.info('* Package db updated.\n')
diff --git a/pisi/operations.py b/pisi/operations.py
index 43940d78..a41f9dad 100644
--- a/pisi/operations.py
+++ b/pisi/operations.py
@@ -3,15 +3,14 @@ import os
 from config import config
 from constants import const
 from ui import ui
-from package import Package
-from installdb import installdb
-from packagedb import packagedb
 from purl import PUrl
 
 # all package operation interfaces are here
 
 def remove(package_name):
     """Remove a goddamn package"""
+    from installdb import installdb
+
     ui.info('Removing package %s\n' % package_name)
     if not installdb.is_installed(package_name):
         raise Exception('Trying to remove nonexistent package '
@@ -33,8 +32,27 @@ def install(pkg_location):
 
 
 def info(package_name):
+    from package import Package
+
     package = Package(package_name)
     package.read()
     return package.metadata, package.files
 
 
+def index(repo_dir = '.'):
+    from index import Index
+
+    ui.info('* Building index of PISI files under %s\n' % repo_dir)
+    index = Index()
+    index.index(repo_dir)
+    index.write('pisi-index.xml')
+    ui.info('* Index file written\n')
+
+def updatedb(indexfile):
+    from index import Index
+
+    ui.info('* Updating DB from index file: %s\n' % indexfile)
+    index = Index()
+    index.read(indexfile)
+    index.update_db()
+    ui.info('* Package db updated.\n')