Cleaned up windows port