try to improve deadline_time cleanup, still broken