Temp removes win32 refs part2