diff --git a/models/CopilotPayment.js b/models/CopilotPayment.js
index d33a851..46c8674 100644
--- a/models/CopilotPayment.js
+++ b/models/CopilotPayment.js
@@ -21,64 +21,29 @@ const schema = new Schema({
     required: true
   },
   project: {
-    type: String,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'ProjectIndex'
-    }
+    type: String
   },
   amount: {type: Number, required: true},
   description: {type: String, required: true},
   challengeId: {
     type: Number,
-    required: false,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'ChallengeIdIndex'
-    }
+    required: false
   },
   challengeUUID: {
     type: String,
-    required: false,
-    index: {
-      global: true,
-      project: true,
-      name: 'ChallengeUUIdIndex'
-    }
+    required: false
   },
   closed: {
     type: String,
     required: true,
-    default: 'false',
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'ClosedIndex'
-    }
+    default: 'false'
   },
   username: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'UsernameIndex'
-    }
+    required: true
   },
   status: {
-    type: String,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'StatusIndex'
-    }
+    type: String
   }
 });
 
diff --git a/models/Issue.js b/models/Issue.js
index 6007c09..082b3c8 100644
--- a/models/Issue.js
+++ b/models/Issue.js
@@ -17,26 +17,14 @@ const schema = new Schema({
   // From the receiver service
   number: {
     type: Number,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'NumberIndex'
-    }
+    required: true
   },
   title: {type: String, required: true},
   body: {type: String},
   prizes: {type: [Number], required: true}, // extracted from title
   provider: {
     type: String,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'ProviderIndex'
-    }
+    required: true
   }, // github or gitlab
   repositoryId: {
     type: Number,
diff --git a/models/User.js b/models/User.js
index 626309f..dc3ca69 100755
--- a/models/User.js
+++ b/models/User.js
@@ -20,13 +20,7 @@ const schema = new Schema({
   },
   userProviderId: {
     type: Number,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'UsesProviderIdIndex'
-    }
+    required: true
   },
   userProviderIdStr: {
     type: String,
@@ -45,24 +39,12 @@ const schema = new Schema({
   role: {
     type: String,
     required: true,
-    enum: _.values(constants.USER_ROLES),
-    index: {
-      global: true,
-      project: true,
-      name: 'RoleIndex',
-      rangeKey: 'id'
-    }
+    enum: _.values(constants.USER_ROLES)
   },
   type: {
     type: String,
     required: true,
-    enum: _.values(constants.USER_TYPES),
-    index: {
-      global: true,
-      rangeKey: 'id',
-      name: 'TypeIndex',
-      project: true
-    }
+    enum: _.values(constants.USER_TYPES)
   },
   // gitlab token data
   accessToken: {type: String, required: false},