update deprecated parts of sync

Please review before merge