improve timeline cleanup