Remove obsolete cruft from windows/ directory.
Merge branch 'windows-cleanup'