removed unnecessary drawings of shapes