remove timer_combined, update files