Starting clean-up of interface of Poly.
Further clean-up on Poly.
Poly mostly clean now.