image sync: unification & simplification (some changes are rolled back)