Remove redraw hack