Fix the whole mess I just made, and also remove the unused ClientServerFactory
Fix topic syncing when timestamps match