clean up for v3
sync