sync-engine simplify