more clean shutdown work...