Clean up win32/64 extraction