Apply same cleanup to Windows makefile