Cleanup the Square type