cleanup on timeline code