More removing of window variables