Clean up mistakes made by merging in windows directory