Loader: Deduplicate and clean up timeline building