remove old implementation
use new implementations of sync