clean up and stabilize sync