Made the eraser button disappear with the shape carousel.  Also did some code cleanup.