Update timer to handle delete_on_complete