diff --git a/peer/bufferset.go b/peer/bufferset.go
deleted file mode 100644
index 333deff..0000000
--- a/peer/bufferset.go
+++ /dev/null
@@ -1 +0,0 @@
-package peer
diff --git a/peer/cipher-discovery.go b/peer/cipher-discovery.go
deleted file mode 100644
index 0e66650..0000000
--- a/peer/cipher-discovery.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package peer
-
-/*
-func signData(privKey *[64]byte, h header, data, out []byte) []byte {
-	out = out[:headerSize]
-	h.Marshal(out)
-	return sign.Sign(out, data, privKey)
-}
-
-func openData(pubKey *[32]byte, signed, out []byte) (data []byte, ok bool) {
-	return sign.Open(out[:0], signed[headerSize:], pubKey)
-}
-*/
diff --git a/peer/cipher.go b/peer/cipher.go
deleted file mode 100644
index 333deff..0000000
--- a/peer/cipher.go
+++ /dev/null
@@ -1 +0,0 @@
-package peer
diff --git a/peer/packets_test.go b/peer/packets_test.go
index c18b40a..f41817b 100644
--- a/peer/packets_test.go
+++ b/peer/packets_test.go
@@ -9,10 +9,8 @@ import (
 
 func TestSynPacket(t *testing.T) {
 	p := packetSyn{
-		TraceID: newTraceID(),
-		//SentAt:        time.Now().UnixMilli(),
-		//SharedKeyType: 1,
-		Direct: true,
+		TraceID: 2342342345,
+		Direct:  true,
 	}
 	rand.Read(p.SharedKey[:])
 
@@ -32,7 +30,7 @@ func TestSynPacket(t *testing.T) {
 
 func TestAckPacket(t *testing.T) {
 	p := packetAck{
-		TraceID: newTraceID(),
+		TraceID: 123213,
 		ToAddr:  netip.AddrPortFrom(netip.AddrFrom4([4]byte{1, 2, 3, 4}), 234),
 	}
 
@@ -52,7 +50,7 @@ func TestAckPacket(t *testing.T) {
 
 func TestProbePacket(t *testing.T) {
 	p := packetProbe{
-		TraceID: newTraceID(),
+		TraceID: 12345,
 	}
 
 	buf := p.Marshal(newBuf())
diff --git a/peer/peersuper.go b/peer/peersuper.go
deleted file mode 100644
index 333deff..0000000
--- a/peer/peersuper.go
+++ /dev/null
@@ -1 +0,0 @@
-package peer
diff --git a/peer/relay.go b/peer/relay.go
deleted file mode 100644
index 333deff..0000000
--- a/peer/relay.go
+++ /dev/null
@@ -1 +0,0 @@
-package peer
diff --git a/peer/remotestate-disconnected.go b/peer/remotestate-disconnected.go
deleted file mode 100644
index 333deff..0000000
--- a/peer/remotestate-disconnected.go
+++ /dev/null
@@ -1 +0,0 @@
-package peer