More sync fixes, cruft removal