diff --git a/core/api.go b/core/api.go
index b07bb99..ac9de2e 100644
--- a/core/api.go
+++ b/core/api.go
@@ -27,7 +27,6 @@ import (
 )
 
 type FileDocumentDesc struct {
-	Service   string `bson:"service" json:"service"`
 	Key       string `bson:"key" json:"key"`
 	Src       string `bson:"src" json:"src"`
 	Link      string `bson:"link" json:"link"`
@@ -110,9 +109,8 @@ var seq = uint32(0)
 
 func (caller apiCaller) uploadAPI(w http.ResponseWriter, r *http.Request) error {
 	if r.Method == "PUT" {
-		servicename := r.FormValue("service")
 		hasher := md5.New()
-		hasher.Write([]byte(servicename))
+		hasher.Write(caller.mg.service().serviceCodeBytes)
 		subfolder := hex.EncodeToString(hasher.Sum(nil))[:8]
 
 		infile, header, err := r.FormFile("file")
@@ -151,12 +149,10 @@ func (caller apiCaller) uploadAPI(w http.ResponseWriter, r *http.Request) error
 			Link:      link,
 			Desc:      desc,
 			Key:       rf,
-			Service:   servicename,
 		}
 		_, _, err = caller.mg.mongoClient.UpsertOne(CollectionFile, bson.M{
-			"_id":     newidobj,
-			"service": servicename,
-			"key":     rf,
+			"_id": newidobj,
+			"key": rf,
 		}, newdoc)
 
 		if err == nil {
diff --git a/core/maingate.go b/core/maingate.go
index 2066cd8..613ad12 100644
--- a/core/maingate.go
+++ b/core/maingate.go
@@ -318,18 +318,6 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 		return err
 	}
 
-	if err = mg.mongoClient.MakeIndices(CollectionWhitelist, map[string]bson.D{
-		"service": {{Key: "service", Value: 1}},
-	}); err != nil {
-		return err
-	}
-
-	if err = mg.mongoClient.MakeIndices(CollectionFile, map[string]bson.D{
-		"service": {{Key: "service", Value: 1}},
-	}); err != nil {
-		return err
-	}
-
 	if err = mg.mongoClient.MakeIndices(CollectionAccount, map[string]bson.D{
 		"accid": {{Key: "accid", Value: 1}},
 	}); err != nil {
@@ -337,11 +325,12 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionFile, map[string]bson.D{
-		"sk": {{Key: "service", Value: 1}, {Key: "key", Value: 1}},
+		"keyonly": {{Key: "key", Value: 1}},
 	}); err != nil {
 		return err
 	}
 
+	// Delete대신 _ts로 expire시킴. pipeline에 삭제 알려주기 위함
 	if err = mg.mongoClient.MakeExpireIndex(CollectionWhitelist, 10); err != nil {
 		return err
 	}