diff --git a/loader/loader.go b/loader/loader.go
index 8b781dfdd3c6e012b016d915072803f84f6d3c34..93ffc426499c802a8ef5d07ae62bed43fdf84e11 100644
--- a/loader/loader.go
+++ b/loader/loader.go
@@ -129,7 +129,7 @@ func (s *state) parseStream(done chan error) {
 
 func (s *state) handleNQuads(wg *sync.WaitGroup) {
 	for nq := range s.cnq {
-		edge, err := nq.ToEdge(s.instanceIdx, s.numInstances, uidStore)
+		edge, err := nq.ToEdge(s.instanceIdx, s.numInstances)
 		for err != nil {
 			// Just put in a retry loop to tackle temporary errors.
 			if err == posting.E_TMP_ERROR {
@@ -140,7 +140,7 @@ func (s *state) handleNQuads(wg *sync.WaitGroup) {
 					Error("While converting to edge")
 				return
 			}
-			edge, err = nq.ToEdge(s.instanceIdx, s.numInstances, uidStore)
+			edge, err = nq.ToEdge(s.instanceIdx, s.numInstances)
 		}
 
 		// Only handle this edge if the attribute satisfies the modulo rule
@@ -159,7 +159,7 @@ func (s *state) handleNQuads(wg *sync.WaitGroup) {
 }
 
 func (s *state) getUidForString(str string) {
-	_, err := rdf.GetUid(str, s.instanceIdx, s.numInstances, dataStore)
+	_, err := rdf.GetUid(str, s.instanceIdx, s.numInstances)
 	for err != nil {
 		// Just put in a retry loop to tackle temporary errors.
 		if err == posting.E_TMP_ERROR {
@@ -171,7 +171,7 @@ func (s *state) getUidForString(str string) {
 				Error("While getting UID")
 			return
 		}
-		_, err = rdf.GetUid(str, s.instanceIdx, s.numInstances, dataStore)
+		_, err = rdf.GetUid(str, s.instanceIdx, s.numInstances)
 	}
 }
 
diff --git a/server/uidassigner/main_test.go b/server/uidassigner/main_test.go
index 269b9a839845955eb9114b67f08f1a2bcf31fd7f..85ec4aa69831725a9512dc70e85848edaf96b5e7 100644
--- a/server/uidassigner/main_test.go
+++ b/server/uidassigner/main_test.go
@@ -41,14 +41,14 @@ func TestQuery(t *testing.T) {
 	list := []string{"alice", "bob", "mallory", "ash", "man", "dgraph"}
 	for _, str := range list {
 		if farm.Fingerprint64([]byte(str))%numInstances == 0 {
-			uid, err := rdf.GetUid(str, 0, numInstances, ps)
+			uid, err := rdf.GetUid(str, 0, numInstances)
 			if uid < minIdx0 || uid > minIdx0+mod-1 {
 				t.Error("Not the correct UID", err)
 			}
 			t.Logf("Instance-0 Correct UID", str, uid)
 
 		} else {
-			uid, err := rdf.GetUid(str, 1, numInstances, ps)
+			uid, err := rdf.GetUid(str, 1, numInstances)
 			if uid < minIdx1 || uid > minIdx1+mod-1 {
 				t.Error("Not the correct UID", err)
 			}