More nice cleanup on exit