diff --git a/spine-unity/Assets/spine-unity/Components/SkeletonAnimator.cs b/spine-unity/Assets/spine-unity/Components/SkeletonAnimator.cs
index c9d0c4da6..80ce9170b 100644
--- a/spine-unity/Assets/spine-unity/Components/SkeletonAnimator.cs
+++ b/spine-unity/Assets/spine-unity/Components/SkeletonAnimator.cs
@@ -28,10 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#if UNITY_5_6_OR_NEWER
-#define UNITY_CLIPINFOCACHE
-#endif
-
 using UnityEngine;
 using System.Collections.Generic;
 
@@ -118,10 +114,8 @@ namespace Spine.Unity {
 			readonly Dictionary<int, Spine.Animation> animationTable = new Dictionary<int, Spine.Animation>(IntEqualityComparer.Instance);
 			readonly Dictionary<AnimationClip, int> clipNameHashCodeTable = new Dictionary<AnimationClip, int>(AnimationClipEqualityComparer.Instance);
 			readonly List<Animation> previousAnimations = new List<Animation>();
-			#if UNITY_CLIPINFOCACHE
 			readonly List<AnimatorClipInfo> clipInfoCache = new List<AnimatorClipInfo>();
 			readonly List<AnimatorClipInfo> nextClipInfoCache = new List<AnimatorClipInfo>();
-			#endif
 
 			Animator animator;
 			public Animator Animator { get { return this.animator; } }
@@ -137,10 +131,8 @@ namespace Spine.Unity {
 					animationTable.Add(a.Name.GetHashCode(), a);
 
 				clipNameHashCodeTable.Clear();
-				#if UNITY_CLIPINFOCACHE
 				clipInfoCache.Clear();
 				nextClipInfoCache.Clear();
-				#endif
 			}
 
 			public void Apply (Skeleton skeleton) {
@@ -265,7 +257,6 @@ namespace Spine.Unity {
 				out int nextClipInfoCount,
 				out IList<AnimatorClipInfo> clipInfo,
 				out IList<AnimatorClipInfo> nextClipInfo) {
-				#if UNITY_CLIPINFOCACHE
 				clipInfoCount = animator.GetCurrentAnimatorClipInfoCount(layer);
 				nextClipInfoCount = animator.GetNextAnimatorClipInfoCount(layer);
 				if (clipInfoCache.Capacity < clipInfoCount) clipInfoCache.Capacity = clipInfoCount;
@@ -275,13 +266,6 @@ namespace Spine.Unity {
 
 				clipInfo = clipInfoCache;
 				nextClipInfo = nextClipInfoCache;
-				#else
-				clipInfo = animator.GetCurrentAnimatorClipInfo(layer);
-				nextClipInfo = animator.GetNextAnimatorClipInfo(layer);
-
-				clipInfoCount = clipInfo.Count;
-				nextClipInfoCount = nextClipInfo.Count;
-				#endif
 			}
 
 			int NameHashCode (AnimationClip clip) {
diff --git a/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs b/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs
index 749cdde4f..13d41b681 100644
--- a/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs
+++ b/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs
@@ -102,11 +102,11 @@ namespace Spine.Unity.Editor {
 					int propertyPathLength = propertyPath.Length;
 
 					int dotCount = 0;
-					const int siblingOfListDotCount = 3;
+					const int SiblingOfListDotCount = 3;
 					for (int i = 1; i < propertyPathLength; i++) {
 						if (propertyPath[propertyPathLength - i] == '.') {
 							dotCount++;
-							if (dotCount >= siblingOfListDotCount) {
+							if (dotCount >= SiblingOfListDotCount) {
 								localPathLength = i - 1;
 								break;
 							}
@@ -157,7 +157,7 @@ namespace Spine.Unity.Editor {
 				get {
 					if (boxScopeStyle == null) {
 						boxScopeStyle = new GUIStyle(EditorStyles.helpBox);
-						var p = boxScopeStyle.padding;
+						RectOffset p = boxScopeStyle.padding; // RectOffset is a class
 						p.right += 6;
 						p.top += 1;
 						p.left += 3;
diff --git a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs
index d1a33f646..00797dc25 100644
--- a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs
+++ b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs
@@ -28,10 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-// Contributed by: Mitch Thompson and John Dy
-
 using UnityEngine;
-using Spine;
 
 namespace Spine.Unity {
 	public static class SkeletonExtensions {