-Removed warning on shut-down