Clean up for Windows