Put back explicit window clearing