diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
index 69e9f3c8..16bb6b35 100644
--- a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
+++ b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
@@ -57,6 +57,9 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
 
         unicornArmLeft.pitch = 0;
         unicornArmRight.pitch = 0;
+
+        unicornArmLeft.yaw = 0;
+        unicornArmRight.yaw = 0;
     }
 
     @Override
@@ -71,19 +74,6 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
         }
     }
 
-    @Override
-    protected void swingItem(T entity) {
-        AbsoluteHand mainSide = getPreferedHand(entity);
-
-        if (canCast() && getArmPoseForSide(mainSide) != ArmPose.EMPTY) {
-            if (getSwingAmount() > -9990 && !attributes.isSleeping) {
-                swingArm(getUnicornArmForSide(mainSide));
-            }
-        } else {
-            super.swingItem(entity);
-        }
-    }
-
     public ArmPose getArmPoseForSide(AbsoluteHand side) {
         return side == AbsoluteHand.RIGHT ? rightArmPose : leftArmPose;
     }