add cleanupShapes