Window clean-up