Drawings cleanup