Use sync-service and updated moped
Merge branch 'use-sync-service'
Minor code cleanup