Remove unused windows/globals

Fixes #3059 
Will test in a moment.