Remove indirection in initial sync completion