diff --git a/Assets/Cryville/Crtr/ChartPlayer.cs b/Assets/Cryville/Crtr/ChartPlayer.cs
index 4487ccd..ba06139 100644
--- a/Assets/Cryville/Crtr/ChartPlayer.cs
+++ b/Assets/Cryville/Crtr/ChartPlayer.cs
@@ -1,4 +1,3 @@
-//#define NO_THREAD
 #define BUILD
 
 using Cryville.Common;
@@ -74,9 +73,7 @@ namespace Cryville.Crtr {
 		}
 
 		public void Dispose() {
-#if !NO_THREAD
 			if (loadThread != null) loadThread.Abort();
-#endif
 			if (texLoader != null) texLoader.Dispose();
 		}
 
@@ -108,9 +105,7 @@ namespace Cryville.Crtr {
 		double atime0;
 		void Update() {
 			if (started) GameUpdate();
-#if !NO_THREAD
 			else if (loadThread != null) LoadUpdate();
-#endif
 			if (logEnabled) LogUpdate();
 			else Game.MainLogger.Enumerate((level, module, msg) => { });
 		}
@@ -308,9 +303,7 @@ namespace Cryville.Crtr {
 			startOffset = Settings.Default.StartOffset;
 			sv = Settings.Default.ScrollVelocity;
 			firstFrame = true;
-#if !NO_THREAD
 			texloaddone = false;
-#endif
 			Game.NetworkTaskWorker.SuspendBackgroundTasks();
 			Game.AudioSession = Game.AudioSequencer.NewSession();
 
@@ -338,23 +331,12 @@ namespace Cryville.Crtr {
 			FileInfo skinFile = new FileInfo(
 				Game.GameDataPath + "/skins/" + Settings.Default.LoadSkin
 			);
-#if NO_THREAD
-			texloadtimer.Stop();
-			Logger.LogFormat("main", 0, "Load/MainThread", "Textures loaded successfully ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds);
-			Load(new LoadInfo(){
-				chartFile = chartFile,
-				rulesetFile = rulesetFile,
-				skinFile = skinFile,
-			});
-			Prehandle();
-#else
 			loadThread = new Thread(new ParameterizedThreadStart(Load));
 			loadThread.Start(new LoadInfo() {
 				chartFile = chartFile,
 				rulesetFile = rulesetFile,
 				skinFile = skinFile,
 			});
-#endif
 
 			Logger.Log("main", 0, "Load/MainThread", "Loading textures...");
 			texloadtimer = new diag::Stopwatch();
@@ -362,15 +344,7 @@ namespace Cryville.Crtr {
 			texs = new Dictionary<string, Texture2D>();
 			var flist = skinFile.Directory.GetFiles("*.png");
 			foreach (FileInfo f in flist) {
-#if NO_THREAD
-				using (WWW w = new WWW("file:///" + f.FullName)) {
-					string name = StringUtils.TrimExt(f.Name);
-					while (!w.isDone);
-					texs.Add(name, w.texture);
-				}
-#else
 				texLoadQueue.Enqueue(f.FullName);
-#endif
 			}
 		}