diff --git a/pypungi/gather.py b/pypungi/gather.py
index 568a1024..37076e9f 100755
--- a/pypungi/gather.py
+++ b/pypungi/gather.py
@@ -90,9 +90,6 @@ class Gather(pypungi.PungiBase):
         else:
             arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
             self.ayum.compatarch = config.get('default', 'arch')
-        #self.doSackSetup(arches)
-        #self.doSackSetup(archlist=arches) # work around temp break in yum api
-        #self.doSackFilelistPopulate()
         arches.append('src') # throw source in there, filter it later
         self.ayum._getSacks(archlist=arches)
 
@@ -353,30 +350,9 @@ class Gather(pypungi.PungiBase):
 
         srpmpolist = []
 
-        ## Work around for yum bug
-        #for sack in self.pkgSack.sacks.values():
-        #    sack.added = {}
-        #    sack.excludes = {}
-
-        #self.pkgSack.excludes = {}
-
-        ## We need to reset the yum object
-        #self.pkgSack = None
-
-        ## Setup the sack with just src arch
-        #self.doSackSetup(archlist=['src'])
-
-        # Make a new yum object
-        #syum = yum.YumBase()
-        #syum.doConfigSetup(fn=self.config.get('default', 'yumconf'), debuglevel=6, errorlevel=6, root=os.path.join(self.workdir, 'yumroot'))
-        #syum.doRepoSetup()
-
-        #syum._getSacks(archlist=['src'])
-
         for srpm in self.srpmlist:
             (sname, sver, srel) = srpm.rsplit('-', 2)
             try:
-                #srpmpo = syum.pkgSack.searchNevra(name=sname, ver=sver, rel=srel)[0]
                 srpmpo = self.ayum.pkgSack.searchNevra(name=sname, ver=sver, rel=srel, arch='src')[0]
                 if not srpmpo in srpmpolist:
                     srpmpolist.append(srpmpo)
@@ -392,7 +368,6 @@ class Gather(pypungi.PungiBase):
             os.makedirs(pkgdir)
 
         for pkg in srpmpolist:
-            #repo = syum.repos.getRepo(pkg.repoid)
             repo = self.ayum.repos.getRepo(pkg.repoid)
             remote = pkg.relativepath
             local = os.path.basename(remote)