Timeline cleaned up a good deal