diff --git a/ristretto255.go b/ristretto255.go
index b0c9730..d891da7 100644
--- a/ristretto255.go
+++ b/ristretto255.go
@@ -8,7 +8,6 @@
 package ristretto255
 
 import (
-	"encoding/hex"
 	"errors"
 
 	"github.com/gtank/ristretto255/internal/edwards25519"
@@ -27,11 +26,6 @@ var (
 	dMinusOneSQ = fieldElementFromDecimal(
 		"40440834346308536858101042469323190826248399146238708352240133220865137265952")
 
-	// The encoding of the Ristretto element that can be represented internally
-	// by the Curve25519 base point.
-	encodedBasepoint, _ = hex.DecodeString(
-		"e2f2ae0a6abc4e71a884a961c500515f58e30b6aa582dd8db6a65945e08d2d76")
-
 	errInvalidEncoding = errors.New("invalid Ristretto encoding")
 )
 
diff --git a/ristretto255_test.go b/ristretto255_test.go
index 63e93f5..530a1c8 100644
--- a/ristretto255_test.go
+++ b/ristretto255_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/gtank/ristretto255/internal/group"
+	"github.com/gtank/ristretto255/internal/edwards25519"
 	"github.com/gtank/ristretto255/internal/radix51"
 )
 
@@ -70,7 +70,7 @@ func TestRistrettoBasepointDecode(t *testing.T) {
 		compressedRistrettoBasepoint, _ = hex.DecodeString("e2f2ae0a6abc4e71a884a961c500515f58e30b6aa582dd8db6a65945e08d2d76")
 
 		// The representative Ristretto basepoint in extended coordinates.
-		ristrettoBasepoint = Element{r: group.ExtendedGroupElement{
+		ristrettoBasepoint = Element{r: edwards25519.ExtendedGroupElement{
 			X: radix51.FieldElement([5]uint64{426475514619346, 2063872706840040, 14628272888959, 107677749330612, 288339085807592}),
 			Y: radix51.FieldElement([5]uint64{1934594822876571, 2049809580636559, 1991994783322914, 1758681962032007, 380046701118659}),
 			Z: radix51.FieldElement([5]uint64{1, 0, 0, 0, 0}),