Removed more win32 stuff