diff --git a/usb/.iso.go.swp b/usb/.iso.go.swp
new file mode 100644
index 0000000..00f2895
Binary files /dev/null and b/usb/.iso.go.swp differ
diff --git a/usb/device.go b/usb/device.go
index 7abf63b..7f1104f 100644
--- a/usb/device.go
+++ b/usb/device.go
@@ -7,7 +7,6 @@ import (
 	"log"
 	"fmt"
 	"reflect"
-	"runtime"
 	"sync"
 	"time"
 	"unsafe"
@@ -45,9 +44,6 @@ func newDevice(handle *C.libusb_device_handle, desc *Descriptor) *Device {
 		claimed:        make(map[uint8]int, ifaces),
 	}
 
-	// This doesn't seem to actually get called
-	runtime.SetFinalizer(d, (*Device).Close)
-
 	return d
 }
 
diff --git a/usb/iso.c b/usb/iso.c
index 25913c8..57b09a1 100644
--- a/usb/iso.c
+++ b/usb/iso.c
@@ -28,20 +28,20 @@ void print_xfer(struct libusb_transfer *xfer) {
 	int i;
 
 	printf("Transfer:\n");
-	//printf("  dev_handle:   %p\n", xfer->dev_handle);
-	//printf("  flags:        %08x\n", xfer->flags);
+	printf("  dev_handle:   %p\n", xfer->dev_handle);
+	printf("  flags:        %08x\n", xfer->flags);
 	printf("  endpoint:     %x\n", xfer->endpoint);
-	//printf("  type:         %x\n", xfer->type);
+	printf("  type:         %x\n", xfer->type);
 	printf("  timeout:      %dms\n", xfer->timeout);
 	printf("  status:       %x\n", xfer->status);
-	printf("  length:       %d (%d)\n", xfer->length, xfer->actual_length);
-	//printf("  callback:     %p\n", xfer->callback);
-	//printf("  user_data:    %p\n", xfer->user_data);
-	//printf("  buffer:       %p\n", xfer->buffer);
+	printf("  length:       %d (act: %d)\n", xfer->length, xfer->actual_length);
+	printf("  callback:     %p\n", xfer->callback);
+	printf("  user_data:    %p\n", xfer->user_data);
+	printf("  buffer:       %p\n", xfer->buffer);
 	printf("  num_iso_pkts: %d\n", xfer->num_iso_packets);
 	printf("  packets:\n");
 	for (i = 0; i < xfer->num_iso_packets; i++) {
-		printf("    [%04d] %d (%d) %x\n", i,
+		printf("    [%04d] %d (act: %d) %x\n", i,
 			xfer->iso_packet_desc[i].length,
 			xfer->iso_packet_desc[i].actual_length,
 			xfer->iso_packet_desc[i].status);
diff --git a/usb/iso.go b/usb/iso.go
index eda5e53..6e2abb9 100644
--- a/usb/iso.go
+++ b/usb/iso.go
@@ -11,7 +11,6 @@ import (
 	"log"
 	"fmt"
 	"reflect"
-	"runtime"
 	"time"
 	"unsafe"
 )
@@ -62,8 +61,6 @@ func (end *endpoint) allocTransfer() *Transfer {
 		buf:  buf,
 	}
 
-	runtime.SetFinalizer(t, (*Transfer).Close)
-
 	return t
 }
 
diff --git a/usb/usb.go b/usb/usb.go
index 3df8bcc..56d13b8 100644
--- a/usb/usb.go
+++ b/usb/usb.go
@@ -7,7 +7,6 @@ import "C"
 import (
 	"log"
 	"reflect"
-	"runtime"
 	"unsafe"
 )
 
@@ -44,9 +43,6 @@ func NewContext() *Context {
 		}
 	}()
 
-	// This doesn't seem to actually get called.  Sigh.
-	runtime.SetFinalizer(c, (*Context).Close)
-
 	return c
 }