Fix redraws by properly cleaning up.