Remove some redundancies. Remove win32 custom files.