More timeline cleanup