Much more nice cleanup on exit