Simplify and fix Windows failures
Remove debug logging