diff --git a/src/main/java/com/minelittlepony/PonyManager.java b/src/main/java/com/minelittlepony/PonyManager.java
index b65a6e9f..ac31d982 100644
--- a/src/main/java/com/minelittlepony/PonyManager.java
+++ b/src/main/java/com/minelittlepony/PonyManager.java
@@ -4,7 +4,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
-import com.minelittlepony.model.PMAPI;
 import com.minelittlepony.pony.data.Pony;
 import com.minelittlepony.pony.data.PonyLevel;
 import com.voxelmodpack.hdskins.HDSkinManager;
@@ -50,13 +49,6 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl
 
     public PonyManager(PonyConfig config) {
         this.config = config;
-        initmodels();
-    }
-
-    private void initmodels() {
-        MineLittlePony.logger.info("Initializing models...");
-        PMAPI.init();
-        MineLittlePony.logger.info("Done initializing models.");
     }
 
     /**
diff --git a/src/main/java/com/minelittlepony/model/ModelWrapper.java b/src/main/java/com/minelittlepony/model/ModelWrapper.java
index 993a41f1..a6de8fdb 100644
--- a/src/main/java/com/minelittlepony/model/ModelWrapper.java
+++ b/src/main/java/com/minelittlepony/model/ModelWrapper.java
@@ -20,6 +20,12 @@ public class ModelWrapper implements IModelWrapper {
         body = model;
         armor = model.createArmour();
         armor.apply(model.getMetadata());
+
+        try {
+            init();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public AbstractPonyModel getBody() {
diff --git a/src/main/java/com/minelittlepony/model/PMAPI.java b/src/main/java/com/minelittlepony/model/PMAPI.java
index 39b67161..cf58b809 100644
--- a/src/main/java/com/minelittlepony/model/PMAPI.java
+++ b/src/main/java/com/minelittlepony/model/PMAPI.java
@@ -1,19 +1,7 @@
 package com.minelittlepony.model;
 
-import com.minelittlepony.model.player.ModelAlicorn;
-import com.minelittlepony.model.player.ModelEarthPony;
-import com.minelittlepony.model.player.ModelPegasus;
-import com.minelittlepony.model.player.ModelUnicorn;
-import com.minelittlepony.model.player.ModelZebra;
-import com.minelittlepony.model.ponies.ModelEnderStallion;
-import com.minelittlepony.model.ponies.ModelIllagerPony;
-import com.minelittlepony.model.ponies.ModelSeapony;
-import com.minelittlepony.model.ponies.ModelSkeletonPony;
-import com.minelittlepony.model.ponies.ModelVillagerPony;
-import com.minelittlepony.model.ponies.ModelWitchPony;
-import com.minelittlepony.model.ponies.ModelZombiePony;
-
-import java.lang.reflect.Field;
+import com.minelittlepony.model.player.*;
+import com.minelittlepony.model.ponies.*;
 
 /**
  * PMAPI - Pony Models API?
@@ -45,15 +33,4 @@ public final class PMAPI {
     public static final ModelWrapper illager = new ModelWrapper(new ModelIllagerPony());
     public static final ModelWrapper witch = new ModelWrapper(new ModelWitchPony());
     public static final ModelWrapper enderman = new ModelWrapper(new ModelEnderStallion());
-
-    public static void init() {
-        for (Field field : PMAPI.class.getFields()) {
-            try {
-                ModelWrapper model = (ModelWrapper) field.get(null);
-                model.init();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }