diff --git a/build.bat b/build.bat
index 2a4c322b..d725b803 100644
--- a/build.bat
+++ b/build.bat
@@ -41,14 +41,14 @@ if "%telemetry%"=="1" set auto_compile_flags=%auto_compile_flags% -DPROFILE_TELE
 if "%asan%"=="1"      set auto_compile_flags=%auto_compile_flags% -fsanitize=address && echo [asan enabled]
 
 :: --- Compile/Link Line Definitions ------------------------------------------
-set cl_common=     /I..\src\ /I..\local\ /nologo /FC /Z7 /MP
-set clang_common=  -I..\src\ -I..\local\ -maes -mssse3 -msse4 -gcodeview -fdiagnostics-absolute-paths -Wall -Wno-unknown-warning-option -Wno-missing-braces -Wno-unused-function -Wno-writable-strings -Wno-unused-value -Wno-unused-variable -Wno-unused-local-typedef -Wno-deprecated-register -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion -Xclang -flto-visibility-public-std -D_USE_MATH_DEFINES -Dstrdup=_strdup -Dgnu_printf=printf
+set cl_common=     /I..\src\ /I..\local\ /nologo /FC /Z7
+set clang_common=  -I..\src\ -I..\local\ -gcodeview -fdiagnostics-absolute-paths -Wall -Wno-unknown-warning-option -Wno-missing-braces -Wno-unused-function -Wno-writable-strings -Wno-unused-value -Wno-unused-variable -Wno-unused-local-typedef -Wno-deprecated-register -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion -Xclang -flto-visibility-public-std -D_USE_MATH_DEFINES -Dstrdup=_strdup -Dgnu_printf=printf
 set cl_debug=      call cl /Od %cl_common%
 set cl_release=    call cl /O2 /DNDEBUG %cl_common%
 set clang_debug=   call clang -g -O0 %clang_common%
 set clang_release= call clang -g -O3 -DNDEBUG %clang_common% 
 set cl_link=       /link /MANIFEST:EMBED /INCREMENTAL:NO /natvis:"%~dp0\src\natvis\base.natvis"
-set clang_link=    -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis"
+set clang_link=    -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis"
 set cl_out=        /out:
 set clang_out=     -o
 
diff --git a/src/os/gfx/os_gfx.h b/src/os/gfx/os_gfx.h
index 42ec880b..9b3c354c 100644
--- a/src/os/gfx/os_gfx.h
+++ b/src/os/gfx/os_gfx.h
@@ -152,7 +152,6 @@ internal void           os_set_cursor(OS_Cursor cursor);
 internal F32            os_double_click_time(void);
 internal F32            os_caret_blink_time(void);
 internal F32            os_default_refresh_rate(void);
-internal B32            os_granular_sleep_enabled(void);
 
 ////////////////////////////////
 //~ rjf: @os_hooks Native Messages & Panics (Implemented Per-OS)
diff --git a/src/os/gfx/win32/os_gfx_win32.c b/src/os/gfx/win32/os_gfx_win32.c
index 29d7a6d1..9ead413f 100644
--- a/src/os/gfx/win32/os_gfx_win32.c
+++ b/src/os/gfx/win32/os_gfx_win32.c
@@ -14,7 +14,6 @@ global Arena *        w32_event_arena = 0;
 global HCURSOR        w32_hcursor = 0;
 global B32            w32_resizing = 0;
 global F32            w32_default_refresh_rate = 60.f;
-global B32            w32_granular_sleep_enabled = 0;
 
 ////////////////////////////////
 //~ allen: Windows SDK Inconsistency Fixer
@@ -585,9 +584,6 @@ os_graphical_init(void)
     }
   }
   
-  //- rjf: try to enable granular sleep
-  w32_granular_sleep_enabled = (timeBeginPeriod(1) == TIMERR_NOERROR);
-  
   //- rjf: set initial cursor
   os_set_cursor(OS_Cursor_Pointer);
 }
@@ -1081,12 +1077,6 @@ os_default_refresh_rate(void)
   return w32_default_refresh_rate;
 }
 
-internal B32
-os_granular_sleep_enabled(void)
-{
-  return w32_granular_sleep_enabled;
-}
-
 ////////////////////////////////
 //~ rjf: @os_hooks Native Messages & Panics (Implemented Per-OS)
 
diff --git a/src/os/gfx/win32/os_gfx_win32.h b/src/os/gfx/win32/os_gfx_win32.h
index 306c048d..547e6822 100644
--- a/src/os/gfx/win32/os_gfx_win32.h
+++ b/src/os/gfx/win32/os_gfx_win32.h
@@ -6,7 +6,6 @@
 
 #pragma comment(lib, "user32")
 #pragma comment(lib, "gdi32")
-#pragma comment(lib, "winmm")
 
 ////////////////////////////////
 //~ rjf: Windows