cleaned up timeline