diff --git a/pkg/importer/foursquare/foursquare.go b/pkg/importer/foursquare/foursquare.go
index e30fcd5d9..89ca55b05 100644
--- a/pkg/importer/foursquare/foursquare.go
+++ b/pkg/importer/foursquare/foursquare.go
@@ -113,16 +113,6 @@ func (r *run) token() string {
 	return r.RunContext.AccountNode().Attr(acctAttrAccessToken)
 }
 
-func (r *run) initRoot() error {
-	root := r.RootNode()
-	user := r.AccountNode().Attr("foursquareUser")
-	if user == "" {
-		return errors.New("The 'foursquareUser' attribute on the account node is empty.")
-	}
-	title := fmt.Sprintf("Foursquare (%s)", user)
-	return root.SetAttr("title", title)
-}
-
 func (im *imp) Run(ctx *importer.RunContext) error {
 	clientId, secret, err := ctx.Credentials()
 	if err != nil {
diff --git a/pkg/importer/importer.go b/pkg/importer/importer.go
index fb7727a46..62a9f9cbf 100644
--- a/pkg/importer/importer.go
+++ b/pkg/importer/importer.go
@@ -204,7 +204,7 @@ func (rc *RunContext) Credentials() (clientID, clientSecret string, err error) {
 // missing anything).
 func (rc *RunContext) AccountNode() *Object { return rc.ia.acct }
 
-// AccountNode returns the initially-empty permanode storing the root
+// RootNode returns the initially-empty permanode storing the root
 // of this account's data. You can change anything at will. This will
 // typically be modeled as a dynamic directory (with camliPath:xxxx
 // attributes), where each path element is either a file, object, or
diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
index 4dc938762..5fb7e63d5 100644
--- a/pkg/schema/schema.go
+++ b/pkg/schema/schema.go
@@ -712,7 +712,7 @@ type claimParam struct {
 	target blob.Ref
 }
 
-func NewClaim(claims ...*claimParam) *Builder {
+func newClaim(claims ...*claimParam) *Builder {
 	bb := base(1, "claim")
 	bb.SetClaimDate(clockNow())
 	if len(claims) == 1 {
@@ -751,7 +751,7 @@ func populateClaimMap(m map[string]interface{}, cp *claimParam) {
 
 // NewShareRef creates a *Builder for a "share" claim.
 func NewShareRef(authType string, target blob.Ref, transitive bool) *Builder {
-	return NewClaim(&claimParam{
+	return newClaim(&claimParam{
 		claimType:  ShareClaim,
 		authType:   authType,
 		target:     target,
@@ -760,7 +760,7 @@ func NewShareRef(authType string, target blob.Ref, transitive bool) *Builder {
 }
 
 func NewSetAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
-	return NewClaim(&claimParam{
+	return newClaim(&claimParam{
 		permanode: permaNode,
 		claimType: SetAttributeClaim,
 		attribute: attr,
@@ -769,7 +769,7 @@ func NewSetAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
 }
 
 func NewAddAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
-	return NewClaim(&claimParam{
+	return newClaim(&claimParam{
 		permanode: permaNode,
 		claimType: AddAttributeClaim,
 		attribute: attr,
@@ -781,7 +781,7 @@ func NewAddAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
 // values set for the attribute attr of permaNode. If value is empty then
 // all the values for attribute are cleared.
 func NewDelAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
-	return NewClaim(&claimParam{
+	return newClaim(&claimParam{
 		permanode: permaNode,
 		claimType: DelAttributeClaim,
 		attribute: attr,
@@ -791,7 +791,7 @@ func NewDelAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
 
 // NewDeleteClaim creates a new claim to delete a target claim or permanode.
 func NewDeleteClaim(target blob.Ref) *Builder {
-	return NewClaim(&claimParam{
+	return newClaim(&claimParam{
 		target:    target,
 		claimType: DeleteClaim,
 	})
diff --git a/pkg/schema/schema_test.go b/pkg/schema/schema_test.go
index fe901816b..10dd96780 100644
--- a/pkg/schema/schema_test.go
+++ b/pkg/schema/schema_test.go
@@ -194,7 +194,7 @@ func TestAttribute(t *testing.T) {
 }`,
 		},
 		{
-			bb: NewClaim(&claimParam{
+			bb: newClaim(&claimParam{
 				permanode: br,
 				claimType: SetAttributeClaim,
 				attribute: "foo",