Intermediate cleanup of Polygon Shape class