added cleanup for after shutdown