Cleanup old sync implementation (pre-comments)