Window surface
Remove unneeded static vars and initializers
Remove commented out code in main
You can also use your local clone with git send-email.