diff --git a/lib/store/MongoStore.js b/lib/store/MongoStore.js
index 7ddbb34..d7f2302 100644
--- a/lib/store/MongoStore.js
+++ b/lib/store/MongoStore.js
@@ -102,7 +102,6 @@ class MongoStore extends Store {
       Object.assign(
         {
           useNewUrlParser: true,
-          autoIndex: false,
         },
         options.dbOptions
       )
@@ -112,27 +111,18 @@ class MongoStore extends Store {
       .then(() => {
         // we're connected!
         debug('Mongodb connected!');
+        //Models
+        this.Signature = conn.model('Signature', SignatureSchema);
+        this.GlobalToken = conn.model('GlobalToken', GlobalTokenSchema);
+        this.OAuthToken = conn.model('OAuthToken', OAuthTokenSchema);
+        this.CardTicket = conn.model('CardTicket', CardTicketSchema);
+        // this.Signature.syncIndexes();
         this.initializeTokenFromDB();
       })
       .catch(err => {
         /* istanbul ignore next */
         debug(err);
       });
-
-    // conn.on('error', err => {
-    //   debug(err);
-    // });
-    // conn.once('open', () => {
-    //   // we're connected!
-    //   debug('Mongodb connected!');
-    //   this.initializeTokenFromDB();
-    // });
-
-    //Models
-    this.Signature = conn.model('Signature', SignatureSchema);
-    this.GlobalToken = conn.model('GlobalToken', GlobalTokenSchema);
-    this.OAuthToken = conn.model('OAuthToken', OAuthTokenSchema);
-    this.CardTicket = conn.model('CardTicket', CardTicketSchema);
   }
 
   /**