Cleaned up from win32