Neater remove-window.