cleanup and more sync