diff --git a/src/localization/plugin.js b/src/localization/plugin.js
index f7ef89719b..0ae1779c2e 100644
--- a/src/localization/plugin.js
+++ b/src/localization/plugin.js
@@ -134,7 +134,7 @@ export default function localizationPlugin(schema, options) {
   });
 
   schema.eachPath((path, schemaType) => {
-    if (schemaType.schema && schemaType.schema.discriminators) {
+    if (schemaType.schema && schemaType.options.localized && schemaType.schema.discriminators) {
       Object.keys(schemaType.schema.discriminators).forEach((key) => {
         if (schema.path(path)) {
           schema.path(path).discriminator(key, schemaType.schema.discriminators[key]);
diff --git a/src/mongoose/requestHandlers/query.js b/src/mongoose/requestHandlers/query.js
index 67306b86ad..5811d220dd 100644
--- a/src/mongoose/requestHandlers/query.js
+++ b/src/mongoose/requestHandlers/query.js
@@ -11,7 +11,6 @@ const query = (req, res) => {
 
   req.model.paginate(req.model.apiQuery(req.query, req.locale), { options: queryOptions }, (err, result) => {
     if (err) {
-      console.log(err);
       return res.status(httpStatus.INTERNAL_SERVER_ERROR).json({ error: err });
     }
     return res.json({
diff --git a/src/mongoose/schema/fieldToSchemaMap.js b/src/mongoose/schema/fieldToSchemaMap.js
index 48f7e62048..c6cca6710f 100644
--- a/src/mongoose/schema/fieldToSchemaMap.js
+++ b/src/mongoose/schema/fieldToSchemaMap.js
@@ -1,5 +1,4 @@
 import { Schema } from 'mongoose';
-import config from '../../auth/passwordResets/config';
 
 const formatBaseSchema = (field) => {
   return {
@@ -66,7 +65,7 @@ const fieldToSchemaMap = {
 
     return {
       type: [flexibleSchema],
-      localized: field.localized || false,
+      localized: false,
     };
   },
 };
diff --git a/src/mongoose/schema/schemaLoader.js b/src/mongoose/schema/schemaLoader.js
deleted file mode 100644
index d00ebd4cfe..0000000000
--- a/src/mongoose/schema/schemaLoader.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import mongoose from 'mongoose';
-import fieldToSchemaMap from './fieldToSchemaMap';
-import localizationPlugin from '../../localization/localization.plugin';
-import autopopulate from '../autopopulate.plugin';
-import paginate from '../paginate.plugin';
-import buildQueryPlugin from '../buildQuery.plugin';
-import validateGlobal from '../../utilities/validateGlobal';
-
-class SchemaLoader {
-
-  blockSchema;
-  contentBlocks = {};
-  collections = {};
-  globals = {};
-  globalModel = {};
-
-  /**
-   * Sets up schema and models using payload config
-   * @param config
-   * @param config.collections
-   * @param config.globals
-   * @param config.contentBlocks
-   */
-  constructor(config) {
-    this.blockSchema = new mongoose.Schema({},
-      { discriminatorKey: 'blockType', _id: false });
-    this.blockSchema.plugin(autopopulate);
-    this.blockSchemaLoader(config);
-    this.collectionSchemaLoader(config);
-    this.globalSchemaLoader(config);
-  }
-
-  blockSchemaLoader = config => {
-    Object.values(config.contentBlocks).forEach(blockConfig => {
-      // TODO: any kind of validation for blocks?
-      const fields = {};
-
-      const flexibleSchema = {};
-      blockConfig.fields.forEach(field => {
-        const fieldSchema = fieldToSchemaMap[field.type];
-        if (fieldSchema) fields[field.name] = fieldSchema(field);
-        if (field.type === 'flexible') {
-          flexibleSchema[field.name] = field;
-        }
-      });
-
-      const Schema = new mongoose.Schema(fields)
-        .plugin(paginate)
-        .plugin(localizationPlugin, config.localization)
-        .plugin(buildQueryPlugin)
-        .plugin(autopopulate, config.localization);
-
-      const Model = mongoose.model(blockConfig.slug, Schema);
-
-      const RefSchema = new mongoose.Schema(
-        {
-          relation: {
-            type: mongoose.Schema.Types.ObjectId,
-            autopopulate: true,
-            ref: blockConfig.slug,
-          }
-        }, { _id: false }
-      );
-      RefSchema.plugin(autopopulate, config.localization);
-
-      Object.values(flexibleSchema).forEach(flexible => {
-        flexible.blocks.forEach(blockType => {
-          Schema
-            .path(flexible.name)
-            .discriminator(blockType, RefSchema)
-        });
-      });
-
-      this.contentBlocks[blockConfig.slug] = {
-        config: blockConfig,
-        Schema,
-        RefSchema,
-        Model,
-      };
-    });
-  };
-
-
-  globalSchemaLoader = config => {
-    let globalSchemaGroups = {};
-    const globalFields = {};
-    Object.values(config.globals).forEach(globalConfig => {
-      validateGlobal(globalConfig, this.globals);
-      this.globals[globalConfig.label] = globalConfig;
-      globalFields[globalConfig.slug] = {};
-
-      globalConfig.fields.forEach(field => {
-        const fieldSchema = fieldToSchemaMap[field.type];
-        if (fieldSchema) globalFields[globalConfig.slug][field.name] = fieldSchema(field, { path: globalConfig.slug, localization: config.localization });
-      });
-      globalSchemaGroups[globalConfig.slug] = new mongoose.Schema(globalFields[globalConfig.slug], { _id: false })
-        .plugin(localizationPlugin, config.localization)
-        .plugin(autopopulate);
-    });
-
-    if (config.globals) {
-      this.globalModel = mongoose.model(
-        'global',
-        new mongoose.Schema({ ...globalSchemaGroups, timestamps: false })
-          .plugin(localizationPlugin, config.localization)
-          .plugin(autopopulate)
-      );
-    }
-  };
-}
-
-module.exports = SchemaLoader;