diff --git a/git.go b/git.go
index e11f676..fdc640a 100644
--- a/git.go
+++ b/git.go
@@ -134,14 +134,7 @@ func Discover(start string, across_fs bool, ceiling_dirs []string) (string, erro
 	retpath := (*C.char)(C.malloc(C.GIT_PATH_MAX))
 	defer C.free(unsafe.Pointer(retpath))
 
-	var acrfs C.int
-	if across_fs {
-		acrfs = 1
-	} else {
-		acrfs = 0
-	}
-
-	r := C.git_repository_discover(retpath, C.GIT_PATH_MAX, cstart, acrfs, ceildirs)
+	r := C.git_repository_discover(retpath, C.GIT_PATH_MAX, cstart, cbool(across_fs), ceildirs)
 
 	if r == 0 {
 		return C.GoString(retpath), nil
diff --git a/packbuilder.go b/packbuilder.go
deleted file mode 100644
index 8cc03bd..0000000
--- a/packbuilder.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package git
-
-/*
-#cgo pkg-config: libgit2
-#include <git2.h>
-#include <git2/errors.h>
-#include <git2/pack.h>
-#include <stdlib.h>
-
-extern int _go_git_packbuilder_foreach(git_packbuilder *pb, void *payload);
-*/
-import "C"
-import (
-	"runtime"
-	"unsafe"
-	"io"
-)
-
-type Packbuilder struct {
-	ptr *C.git_packbuilder
-}
-
-func (repo *Repository) NewPackbuilder() (*Packbuilder, error) {
-	builder := &Packbuilder{}
-	ret := C.git_packbuilder_new(&builder.ptr, repo.ptr)
-	if ret != 0 {
-		return nil, LastError()
-	}
-	runtime.SetFinalizer(builder, (*Packbuilder).Free)
-	return builder, nil
-}
-
-func (pb *Packbuilder) Free() {
-	runtime.SetFinalizer(pb, nil)
-	C.git_packbuilder_free(pb.ptr)
-}
-
-func (pb *Packbuilder) Insert(id *Oid, name string) error {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ret := C.git_packbuilder_insert(pb.ptr, id.toC(), cname)
-	if ret != 0 {
-		return LastError()
-	}
-	return nil
-}
-
-func (pb *Packbuilder) InsertCommit(id *Oid) error {
-	ret := C.git_packbuilder_insert_commit(pb.ptr, id.toC())
-	if ret != 0 {
-		return LastError()
-	}
-	return nil
-}
-
-func (pb *Packbuilder) InsertTree(id *Oid) error {
-	ret := C.git_packbuilder_insert_tree(pb.ptr, id.toC())
-	if ret != 0 {
-		return LastError()
-	}
-	return nil
-}
-
-func (pb *Packbuilder) ObjectCount() uint32 {
-	return uint32(C.git_packbuilder_object_count(pb.ptr))
-}
-
-func (pb *Packbuilder) WriteToFile(name string) error {
-	cname := C.CString(name)
-	defer C.free(unsafe.Pointer(cname))
-	ret := C.git_packbuilder_write(pb.ptr, cname)
-	if ret != 0 {
-		return LastError()
-	}
-	return nil
-}
-
-func (pb *Packbuilder) Write(w io.Writer) error {
-	ch := pb.ForEach()
-	for slice := range ch {
-		_, err := w.Write(slice)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (pb *Packbuilder) Written() uint32 {
-	return uint32(C.git_packbuilder_written(pb.ptr))
-}
-
-//export packbuilderForEachCb
-func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Pointer) int {
-	ch := *(*chan []byte)(payload)
-
-	slice := C.GoBytes(buf, C.int(size))
-	ch <- slice
-	return 0
-}
-
-func (pb *Packbuilder) forEachWrap(ch chan []byte) {
-	C._go_git_packbuilder_foreach(pb.ptr, unsafe.Pointer(&ch))
-	close(ch)
-}
-
-func (pb *Packbuilder) ForEach() chan []byte {
-	ch := make(chan []byte, 0)
-	go pb.forEachWrap(ch)
-	return ch
-}
diff --git a/wrapper.c b/wrapper.c
index 67f34fd..13478cb 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -1,7 +1,6 @@
 #include "_cgo_export.h"
 #include "git2.h"
 #include "git2/submodule.h"
-#include "git2/pack.h"
 
 typedef int (*gogit_submodule_cbk)(git_submodule *sm, const char *name, void *payload);
 
@@ -15,9 +14,4 @@ int _go_git_treewalk(git_tree *tree, git_treewalk_mode mode, void *ptr)
 	return git_tree_walk(tree, mode, (git_treewalk_cb)&CallbackGitTreeWalk, ptr);
 }
 
-int _go_git_packbuilder_foreach(git_packbuilder *pb, void *payload)
-{
-    return git_packbuilder_foreach(pb, (git_packbuilder_foreach_cb)&packbuilderForEachCb, payload);
-}
-
 /* EOF */