Be better at cleaning up at destruction time. Still stuff to do.