More Timeline cleanup