remove debug cruft.  I think we're there.