WIP on sync settings
Revert "WIP on sync settings"

This reverts commit 3b707dbf9e8cb8bc5727c80fe111dca1f5078c49.
Simpler approach to sync settings

Let us not over-engineer...