Cleaned up some of the non-functional win32 cleanup code.