Some cleanup of Poly.