function omf.bundle.remove
    set bundle $OMF_CONFIG/bundle

    if test -f $bundle
      set type $argv[1]
      set name $argv[2]
      set bundle_contents (cat $bundle | sort -u)

      rm -f $bundle

      for record in $bundle_contents
        set record_type (echo $record | cut -d' ' -f1)
        set record_name (echo $record | cut -d' ' -f2-)
        set record_basename (basename (echo $record_name | \
          sed -e 's/\.git$//') | sed 's/^pkg-//;s/^plugin-//;s/^theme-//')

        if not test "$type" = "$record_type" -a "$name" = "$record_basename"
          echo "$record_type $record_name" >> $bundle
        end
      end
    end

    return 0
  end