diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfEditorUtils.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfEditorUtils.cs
index 2f261fd..9ce021a 100644
--- a/Assets/FlashTools/Scripts/Internal/Editor/SwfEditorUtils.cs
+++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfEditorUtils.cs
@@ -28,12 +28,11 @@ namespace FlashTools.Internal {
 		}
 
 		public static void DoWithEnabledGUI(bool enabled, System.Action act) {
-			var last_gui_enabled = GUI.enabled;
-			GUI.enabled = enabled;
+			EditorGUI.BeginDisabledGroup(true);
 			try {
 				act();
 			} finally {
-				GUI.enabled = last_gui_enabled;
+				EditorGUI.EndDisabledGroup();
 			}
 		}
 
diff --git a/Assets/FlashTools/Scripts/Internal/Editor/Tests/SwfUtilsTests.cs b/Assets/FlashTools/Scripts/Internal/Editor/Tests/SwfUtilsTests.cs
index 129c557..a8b88ca 100644
--- a/Assets/FlashTools/Scripts/Internal/Editor/Tests/SwfUtilsTests.cs
+++ b/Assets/FlashTools/Scripts/Internal/Editor/Tests/SwfUtilsTests.cs
@@ -9,12 +9,6 @@ namespace FlashTools.Internal.Tests {
 			Assert.AreEqual(v0.y, v1.y, delta);
 		}
 
-		static void AssertAreEqualVectors(Vector3 v0, Vector3 v1, float delta) {
-			Assert.AreEqual(v0.x, v1.x, delta);
-			Assert.AreEqual(v0.y, v1.y, delta);
-			Assert.AreEqual(v0.z, v1.z, delta);
-		}
-
 		static void AssertAreEqualVectors(Vector4 v0, Vector4 v1, float delta) {
 			Assert.AreEqual(v0.x, v1.x, delta);
 			Assert.AreEqual(v0.y, v1.y, delta);
@@ -26,23 +20,6 @@ namespace FlashTools.Internal.Tests {
 		//
 		//
 
-		[Test]
-		public static void PackBytesToUIntTests() {
-			byte b0 = 1, b1 = 10, b2 = 100, b3 = 255;
-			byte bb0, bb1, bb2, bb3;
-			SwfUtils.UnpackBytesFromUInt(
-				SwfUtils.PackBytesToUInt(b0, b1, b2, b3),
-				out bb0, out bb1, out bb2, out bb3);
-			Assert.AreEqual(b0, bb0);
-			Assert.AreEqual(b1, bb1);
-			Assert.AreEqual(b2, bb2);
-			Assert.AreEqual(b3, bb3);
-		}
-
-		//
-		//
-		//
-
 		[Test]
 		public static void PackUShortsToUIntTests() {
 			ushort v0 = 11, v1 = 99;
@@ -64,17 +41,17 @@ namespace FlashTools.Internal.Tests {
 		public static void PackUVTests() {
 			var v0 = new Vector2(0.9999f, 0.1111f);
 			float u0, u1;
-			SwfUtils.UnpackUV(SwfUtils.PackUV(v0), out u0, out u1);
+			SwfUtils.UnpackUV(SwfUtils.PackUV(v0.x, v0.y), out u0, out u1);
 			AssertAreEqualVectors(v0, new Vector2(u0, u1), SwfUtils.UVPrecision);
 
 			var v1 = new Vector2(0.0987f, 0.0123f);
 			float u2, u3;
-			SwfUtils.UnpackUV(SwfUtils.PackUV(v1), out u2, out u3);
+			SwfUtils.UnpackUV(SwfUtils.PackUV(v1.x, v1.y), out u2, out u3);
 			AssertAreEqualVectors(v1, new Vector2(u2, u3), SwfUtils.UVPrecision);
 
 			var v2 = new Vector2(1.0f, 0.0f);
 			float u4, u5;
-			SwfUtils.UnpackUV(SwfUtils.PackUV(v2), out u4, out u5);
+			SwfUtils.UnpackUV(SwfUtils.PackUV(v2.x, v2.y), out u4, out u5);
 			AssertAreEqualVectors(v2, new Vector2(u4, u5), SwfUtils.UVPrecision);
 		}
 
diff --git a/Assets/FlashTools/Scripts/Internal/SwfUtils.cs b/Assets/FlashTools/Scripts/Internal/SwfUtils.cs
index d87da11..eee4e90 100644
--- a/Assets/FlashTools/Scripts/Internal/SwfUtils.cs
+++ b/Assets/FlashTools/Scripts/Internal/SwfUtils.cs
@@ -13,30 +13,6 @@ namespace FlashTools.Internal {
 		//
 		//
 
-		public static uint PackBytesToUInt(
-			byte b0, byte b1, byte b2, byte b3)
-		{
-			var bb0 = (uint)b0;
-			var bb1 = (uint)b1;
-			var bb2 = (uint)b2;
-			var bb3 = (uint)b3;
-			return (bb0 << 24) + (bb1 << 16) + (bb2 << 8) + bb3;
-		}
-
-		public static void UnpackBytesFromUInt(
-			uint pack,
-			out byte b0, out byte b1, out byte b2, out byte b3)
-		{
-			b0 = (byte)((pack >> 24) & 0xFF);
-			b1 = (byte)((pack >> 16) & 0xFF);
-			b2 = (byte)((pack >>  8) & 0xFF);
-			b3 = (byte)((pack      ) & 0xFF);
-		}
-
-		//
-		//
-		//
-
 		public static uint PackUShortsToUInt(ushort x, ushort y) {
 			var xx = (uint)x;
 			var yy = (uint)y;
@@ -54,9 +30,6 @@ namespace FlashTools.Internal {
 		//
 		//
 		//
-		public static uint PackUV(Vector2 uv) {
-			return PackUV(uv.x, uv.y);
-		}
 
 		public static uint PackUV(float u, float v) {
 			var uu = (uint)(Mathf.Clamp01(u) * UShortMax);