Move custom sync to collection
Cleanup (whitespace, useless file)