From 8863c80faca190c8b9179847b6760c31b473aec1 Mon Sep 17 00:00:00 2001
From: Lukasz Jagodzinski <luke.jagodzinski@gmail.com>
Date: Thu, 1 Oct 2015 00:12:00 +0200
Subject: [PATCH] Clean up code after the fix

---
 lib/modules/fields/modifiers.js        |  3 ---
 lib/modules/indexes/init_definition.js |  4 ----
 lib/modules/storage/init_definition.js |  7 ++++---
 lib/modules/storage/init_schema.js     | 16 ----------------
 package.js                             |  3 +--
 5 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 lib/modules/storage/init_schema.js

diff --git a/lib/modules/fields/modifiers.js b/lib/modules/fields/modifiers.js
index 0f26034..af6d055 100644
--- a/lib/modules/fields/modifiers.js
+++ b/lib/modules/fields/modifiers.js
@@ -227,9 +227,6 @@ proto._getModifiers = function(nested) {
       var nestedDocs = doc[fieldName];
       _.each(nestedDocs, function(nestedDoc, nestedDocIndex) {
         // Get a modifier for a nested document.
-        if (!nestedDoc._getModifiers) {
-          console.log(doc, fieldName, nestedDocs);
-        }
         var nestedDocModifier = nestedDoc._getModifiers();
         // We have to loop through modifiers list and check if some modifiers
         // already exist in the parent modifier. If so, then we will try to
diff --git a/lib/modules/indexes/init_definition.js b/lib/modules/indexes/init_definition.js
index 05aa873..b9c3f92 100644
--- a/lib/modules/indexes/init_definition.js
+++ b/lib/modules/indexes/init_definition.js
@@ -67,10 +67,6 @@ Astro.eventManager.on(
     }
 
     if (_.size(indexesDefinitions) > 0) {
-      if (Class.getName()) {
-        console.log(subSchema);
-      }
-
       var Collection = Class.getCollection();
       if (!Collection) {
         return;
diff --git a/lib/modules/storage/init_definition.js b/lib/modules/storage/init_definition.js
index 45f0f9b..76cd8f0 100644
--- a/lib/modules/storage/init_definition.js
+++ b/lib/modules/storage/init_definition.js
@@ -281,8 +281,7 @@ Astro.eventManager.on(
         _id: {
           type: 'string'
         }
-      },
-      events: {}
+      }
     };
 
     // Add the "type" field, to distinguish to what class we have to cast a
@@ -295,7 +294,9 @@ Astro.eventManager.on(
       };
 
       // Add the "afterInit" event handler that sets a type field.
-      extendDefinition.events.afterInit = [events.afterInit];
+      extendDefinition.events = {
+        afterInit: [events.afterInit]
+      };
     }
 
     // Extend the current schema definition.
diff --git a/lib/modules/storage/init_schema.js b/lib/modules/storage/init_schema.js
deleted file mode 100644
index 315f797..0000000
--- a/lib/modules/storage/init_schema.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Astro.eventManager.on(
-  'initSchema', function onInitSchemaStorage(schemaDefinition) {
-    var schema = this;
-
-    // Set collection for schema.
-    if (_.has(schemaDefinition, 'collection')) {
-      schema.collection = schemaDefinition.collection;
-      if (_.has(schemaDefinition, 'transform')) {
-        schema.transform = schemaDefinition.transform;
-      }
-      if (_.has(schemaDefinition, 'typeField')) {
-        schema.typeField = schemaDefinition.typeField;
-      }
-    }
-  }
-);
diff --git a/package.js b/package.js
index 0b990eb..490549f 100644
--- a/package.js
+++ b/package.js
@@ -35,8 +35,7 @@ Package.onUse(function(api) {
   // Storage module.
   api.addFiles([
     'lib/modules/storage/init_class.js',
-    'lib/modules/storage/init_definition.js',
-    'lib/modules/storage/init_schema.js'
+    'lib/modules/storage/init_definition.js'
   ], ['client', 'server']);
 
   // Behaviors module.