TimeLine cleanup

TimeLine cleanup