Minor changes

Timelines are now cleared instead of being re-created